made another pipeline reg and fixed some syntax

CSaehle · Oct 13, 2012 · fe7cdde · fe7cdde
1 parent 805c049
commit fe7cdde
Show file tree

Hide file tree

Showing 25 changed files with 941 additions and 139 deletions.
diff --git a/oving1/_xmsgs/pn_parser.xmsgs b/oving1/_xmsgs/pn_parser.xmsgs
@@ -8,7 +8,7 @@
 <!-- Copyright (c) 1995-2010 Xilinx, Inc.  All rights reserved.    -->
 
 <messages>
-<msg type="info" file="ProjectMgmt" num="1061" ><arg fmt="%s" index="1">Parsing VHDL file &quot;Z:/git/GitHub/tdt4255/oving1/idex.vhd&quot; into library work</arg>
+<msg type="info" file="ProjectMgmt" num="1061" ><arg fmt="%s" index="1">Parsing VHDL file &quot;C:/Users/chribru/Desktop/GitHub/tdt4255/oving1/reg_idex.vhd&quot; into library work</arg>
 </msg>
 
 </messages>

diff --git a/oving1/_xmsgs/xst.xmsgs b/oving1/_xmsgs/xst.xmsgs
@@ -5,5 +5,26 @@
      behavior or data corruption.  It is strongly advised that
      users do not edit the contents of this file. -->
 <messages>
+<msg type="error" file="HDLCompiler" num="845" delta="new" >"\Users\chribru\Desktop\GitHub\tdt4255\oving1\reg_idex.vhd" Line 72: Type of aggregate cannot be determined without context ; <arg fmt="%d" index="1">0</arg> visible types match here
+</msg>
+
+<msg type="error" file="HDLCompiler" num="845" delta="new" >"\Users\chribru\Desktop\GitHub\tdt4255\oving1\reg_idex.vhd" Line 73: Type of aggregate cannot be determined without context ; <arg fmt="%d" index="1">0</arg> visible types match here
+</msg>
+
+<msg type="error" file="HDLCompiler" num="845" delta="new" >"\Users\chribru\Desktop\GitHub\tdt4255\oving1\reg_idex.vhd" Line 74: Type of aggregate cannot be determined without context ; <arg fmt="%d" index="1">0</arg> visible types match here
+</msg>
+
+<msg type="error" file="HDLCompiler" num="845" delta="new" >"\Users\chribru\Desktop\GitHub\tdt4255\oving1\reg_idex.vhd" Line 75: Type of aggregate cannot be determined without context ; <arg fmt="%d" index="1">0</arg> visible types match here
+</msg>
+
+<msg type="error" file="HDLCompiler" num="845" delta="new" >"\Users\chribru\Desktop\GitHub\tdt4255\oving1\reg_idex.vhd" Line 76: Type of aggregate cannot be determined without context ; <arg fmt="%d" index="1">0</arg> visible types match here
+</msg>
+
+<msg type="error" file="HDLCompiler" num="845" delta="new" >"\Users\chribru\Desktop\GitHub\tdt4255\oving1\reg_idex.vhd" Line 78: Type of aggregate cannot be determined without context ; <arg fmt="%d" index="1">0</arg> visible types match here
+</msg>
+
+<msg type="error" file="HDLCompiler" num="854" delta="new" >"\Users\chribru\Desktop\GitHub\tdt4255\oving1\reg_idex.vhd" Line 64: Unit &lt;<arg fmt="%s" index="1">behavioral</arg>&gt; ignored due to previous errors.
+</msg>
+
 </messages>
 
diff --git a/oving1/iseconfig/oving1.projectmgr b/oving1/iseconfig/oving1.projectmgr
@@ -17,13 +17,13 @@
          <ClosedNode>/toplevel - Behavioral Z:|github|tdt4255|oving1|toplevel.vhd/MIPS_SC_PROCESSOR - processor - Behavioral/inst_pc_handle - pc_handle - Behavioral</ClosedNode>
       </ClosedNodes>
       <SelectedItems>
-         <SelectedItem>MIPS_SC_PROCESSOR - processor - Behavioral (Z:/github/tdt4255/oving1/processor.vhd)</SelectedItem>
+         <SelectedItem>reg_idex - Behavioral (C:/Users/chribru/Desktop/GitHub/tdt4255/oving1/reg_idex.vhd)</SelectedItem>
       </SelectedItems>
       <ScrollbarPosition orientation="vertical" >0</ScrollbarPosition>
       <ScrollbarPosition orientation="horizontal" >0</ScrollbarPosition>
       <ViewHeaderState orientation="horizontal" >000000ff000000000000000100000001000000000000000000000000000000000202000000010000000100000064000000e7000000020000000000000000000000000000000064ffffffff000000810000000000000002000000e70000000100000000000000000000000100000000</ViewHeaderState>
       <UserChangedColumnWidths orientation="horizontal" >true</UserChangedColumnWidths>
-      <CurrentItem>MIPS_SC_PROCESSOR - processor - Behavioral (Z:/github/tdt4255/oving1/processor.vhd)</CurrentItem>
+      <CurrentItem>reg_idex - Behavioral (C:/Users/chribru/Desktop/GitHub/tdt4255/oving1/reg_idex.vhd)</CurrentItem>
    </ItemView>
    <ItemView engineview="SynthesisOnly" sourcetype="" guiview="Process" >
       <ClosedNodes>
@@ -43,13 +43,13 @@
          <ClosedNodesVersion>1</ClosedNodesVersion>
       </ClosedNodes>
       <SelectedItems>
-         <SelectedItem>Z:\github\tdt4255\oving1\processor.vhd</SelectedItem>
+         <SelectedItem>reg_idex.vhd</SelectedItem>
       </SelectedItems>
       <ScrollbarPosition orientation="vertical" >0</ScrollbarPosition>
       <ScrollbarPosition orientation="horizontal" >0</ScrollbarPosition>
-      <ViewHeaderState orientation="horizontal" >000000ff000000000000000100000000000000000100000000000000000000000000000000000003a1000000040101000100000000000000000000000064ffffffff000000810000000000000004000000e50000000100000000000000240000000100000000000000660000000100000000000002320000000100000000</ViewHeaderState>
+      <ViewHeaderState orientation="horizontal" >000000ff000000000000000100000000000000000100000000000000000000000000000000000001d3000000040101000100000000000000000000000064ffffffff000000810000000000000004000000e50000000100000000000000240000000100000000000000660000000100000000000000640000000100000000</ViewHeaderState>
       <UserChangedColumnWidths orientation="horizontal" >false</UserChangedColumnWidths>
-      <CurrentItem>Z:\github\tdt4255\oving1\processor.vhd</CurrentItem>
+      <CurrentItem>reg_idex.vhd</CurrentItem>
    </ItemView>
    <ItemView guiview="Library" >
       <ClosedNodes>
@@ -58,12 +58,12 @@
       <SelectedItems/>
       <ScrollbarPosition orientation="vertical" >0</ScrollbarPosition>
       <ScrollbarPosition orientation="horizontal" >0</ScrollbarPosition>
-      <ViewHeaderState orientation="horizontal" >000000ff000000000000000100000000000000000100000000000000000000000000000000000000f9000000010001000100000000000000000000000064ffffffff000000810000000000000001000000f90000000100000000</ViewHeaderState>
+      <ViewHeaderState orientation="horizontal" >000000ff000000000000000100000000000000000100000000000000000000000000000000000000f8000000010001000100000000000000000000000064ffffffff000000810000000000000001000000f80000000100000000</ViewHeaderState>
       <UserChangedColumnWidths orientation="horizontal" >false</UserChangedColumnWidths>
       <CurrentItem>work</CurrentItem>
    </ItemView>
    <SourceProcessView>000000ff00000000000000020000011b0000011b01000000050100000002</SourceProcessView>
-   <CurrentView>Behavioral Simulation</CurrentView>
+   <CurrentView>Implementation</CurrentView>
    <ItemView engineview="SynthesisOnly" sourcetype="DESUT_VHDL_ARCHITECTURE" guiview="Process" >
       <ClosedNodes>
          <ClosedNodesVersion>1</ClosedNodesVersion>
@@ -74,48 +74,55 @@
          <ClosedNode>User Constraints</ClosedNode>
       </ClosedNodes>
       <SelectedItems>
-         <SelectedItem></SelectedItem>
+         <SelectedItem>Check Syntax</SelectedItem>
       </SelectedItems>
       <ScrollbarPosition orientation="vertical" >0</ScrollbarPosition>
       <ScrollbarPosition orientation="horizontal" >0</ScrollbarPosition>
-      <ViewHeaderState orientation="horizontal" >000000ff00000000000000010000000100000000000000000000000000000000000000000000000139000000010000000100000000000000000000000064ffffffff000000810000000000000001000001390000000100000000</ViewHeaderState>
+      <ViewHeaderState orientation="horizontal" >000000ff000000000000000100000001000000000000000000000000000000000000000000000001a0000000010000000100000000000000000000000064ffffffff000000810000000000000001000001a00000000100000000</ViewHeaderState>
       <UserChangedColumnWidths orientation="horizontal" >false</UserChangedColumnWidths>
-      <CurrentItem></CurrentItem>
+      <CurrentItem>Check Syntax</CurrentItem>
    </ItemView>
    <ItemView engineview="BehavioralSim" guiview="Source" compilemode="AutoCompile" >
       <ClosedNodes>
          <ClosedNodesVersion>2</ClosedNodesVersion>
          <ClosedNode>/adder - Behavioral Z:|github|tdt4255|oving1|adder.vhd</ClosedNode>
          <ClosedNode>/alu - Behavioral Z:|github|tdt4255|oving1|alu.vhd</ClosedNode>
+         <ClosedNode>/tb_adder - behavior C:|Users|chribru|Desktop|GitHub|tdt4255|oving1|tb_adder.vhd</ClosedNode>
+         <ClosedNode>/tb_alu - behavior C:|Users|chribru|Desktop|GitHub|tdt4255|oving1|tb_alu.vhd</ClosedNode>
+         <ClosedNode>/tb_alu_control - behavior C:|Users|chribru|Desktop|GitHub|tdt4255|oving1|tb_alu_control.vhd</ClosedNode>
          <ClosedNode>/tb_alu_control - behavior Z:|github|tdt4255|oving1|tb_alu_control.vhd</ClosedNode>
+         <ClosedNode>/tb_control_unit - behavior C:|Users|chribru|Desktop|GitHub|tdt4255|oving1|tb_control_unit.vhd</ClosedNode>
          <ClosedNode>/tb_control_unit - behavior Z:|github|tdt4255|oving1|tb_control_unit.vhd</ClosedNode>
+         <ClosedNode>/tb_pc - behavior C:|Users|chribru|Desktop|GitHub|tdt4255|oving1|tb_pc.vhd</ClosedNode>
          <ClosedNode>/tb_pc_handle - behavior C:|Users|chribru|Desktop|GitHub|tdt4255|oving1|tb_pc_handle.vhd</ClosedNode>
          <ClosedNode>/tb_pc_handle - behavior Z:|github|tdt4255|oving1|tb_pc_handle.vhd</ClosedNode>
+         <ClosedNode>/tb_shift_two - behavior C:|Users|chribru|Desktop|GitHub|tdt4255|oving1|tb_shift_two.vhd</ClosedNode>
+         <ClosedNode>/tb_sign_extend - behavior C:|Users|chribru|Desktop|GitHub|tdt4255|oving1|tb_sign_extend.vhd</ClosedNode>
          <ClosedNode>/tb_sign_extend - behavior Z:|github|tdt4255|oving1|tb_sign_extend.vhd</ClosedNode>
          <ClosedNode>/tb_toplevel - behavior Z:|github|tdt4255|oving1|tb_toplevel.vhd</ClosedNode>
       </ClosedNodes>
       <SelectedItems>
-         <SelectedItem>tb_toplevel - behavior (Z:/github/tdt4255/oving1/tb_toplevel.vhd)</SelectedItem>
+         <SelectedItem>reg_ifid - Behavioral (C:/Users/chribru/Desktop/GitHub/tdt4255/oving1/reg_ifid.vhd)</SelectedItem>
       </SelectedItems>
       <ScrollbarPosition orientation="vertical" >0</ScrollbarPosition>
       <ScrollbarPosition orientation="horizontal" >0</ScrollbarPosition>
       <ViewHeaderState orientation="horizontal" >000000ff000000000000000100000001000000000000000000000000000000000202000000010000000100000064000001e2000000020000000000000000000000000000000064ffffffff000000810000000000000002000001e20000000100000000000000000000000100000000</ViewHeaderState>
       <UserChangedColumnWidths orientation="horizontal" >true</UserChangedColumnWidths>
-      <CurrentItem>tb_toplevel - behavior (Z:/github/tdt4255/oving1/tb_toplevel.vhd)</CurrentItem>
+      <CurrentItem>reg_ifid - Behavioral (C:/Users/chribru/Desktop/GitHub/tdt4255/oving1/reg_ifid.vhd)</CurrentItem>
    </ItemView>
    <ItemView engineview="BehavioralSim" sourcetype="" guiview="Process" >
       <ClosedNodes>
          <ClosedNodesVersion>1</ClosedNodesVersion>
          <ClosedNode>Design Utilities</ClosedNode>
       </ClosedNodes>
       <SelectedItems>
-         <SelectedItem/>
+         <SelectedItem></SelectedItem>
       </SelectedItems>
       <ScrollbarPosition orientation="vertical" >0</ScrollbarPosition>
       <ScrollbarPosition orientation="horizontal" >0</ScrollbarPosition>
-      <ViewHeaderState orientation="horizontal" >000000ff00000000000000010000000100000000000000000000000000000000000000000000000139000000010000000100000000000000000000000064ffffffff000000810000000000000001000001390000000100000000</ViewHeaderState>
+      <ViewHeaderState orientation="horizontal" >000000ff000000000000000100000001000000000000000000000000000000000000000000000001a0000000010000000100000000000000000000000064ffffffff000000810000000000000001000001a00000000100000000</ViewHeaderState>
       <UserChangedColumnWidths orientation="horizontal" >false</UserChangedColumnWidths>
-      <CurrentItem/>
+      <CurrentItem></CurrentItem>
    </ItemView>
    <ItemView engineview="BehavioralSim" sourcetype="DESUT_VHDL_ARCHITECTURE" guiview="Process" >
       <ClosedNodes>
@@ -126,7 +133,7 @@
       </SelectedItems>
       <ScrollbarPosition orientation="vertical" >0</ScrollbarPosition>
       <ScrollbarPosition orientation="horizontal" >0</ScrollbarPosition>
-      <ViewHeaderState orientation="horizontal" >000000ff00000000000000010000000100000000000000000000000000000000000000000000000139000000010000000100000000000000000000000064ffffffff000000810000000000000001000001390000000100000000</ViewHeaderState>
+      <ViewHeaderState orientation="horizontal" >000000ff000000000000000100000001000000000000000000000000000000000000000000000001a0000000010000000100000000000000000000000064ffffffff000000810000000000000001000001a00000000100000000</ViewHeaderState>
       <UserChangedColumnWidths orientation="horizontal" >false</UserChangedColumnWidths>
       <CurrentItem></CurrentItem>
    </ItemView>

diff --git a/oving1/iseconfig/toplevel.xreport b/oving1/iseconfig/toplevel.xreport
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <report-views version="2.0" >
  <header>
-  <DateModified>2012-10-13T20:11:51</DateModified>
+  <DateModified>2012-10-13T22:23:07</DateModified>
   <ModuleName>toplevel</ModuleName>
   <SummaryTimeStamp>Unknown</SummaryTimeStamp>
-  <SavedFilePath>//sambaad.stud.ntnu.no/terjesc/git/GitHub/tdt4255/oving1/iseconfig/toplevel.xreport</SavedFilePath>
-  <ImplementationReportsDirectory>Z:/git/GitHub/tdt4255/oving1\</ImplementationReportsDirectory>
+  <SavedFilePath>C:/Users/chribru/Desktop/GitHub/tdt4255/oving1/iseconfig/toplevel.xreport</SavedFilePath>
+  <ImplementationReportsDirectory>C:/Users/chribru/Desktop/GitHub/tdt4255/oving1\</ImplementationReportsDirectory>
   <DateInitialized>2012-09-28T22:24:59</DateInitialized>
   <EnableMessageFiltering>false</EnableMessageFiltering>
  </header>

diff --git a/oving1/oving1.gise b/oving1/oving1.gise
@@ -45,6 +45,15 @@
     <file xil_pn:fileType="FILE_XST_PROJECT" xil_pn:name="reg_32.prj"/>
     <file xil_pn:fileType="FILE_XST_STX" xil_pn:name="reg_32.stx"/>
     <file xil_pn:fileType="FILE_XST" xil_pn:name="reg_32.xst"/>
+    <file xil_pn:fileType="FILE_XST_PROJECT" xil_pn:name="reg_exmem.prj"/>
+    <file xil_pn:fileType="FILE_XST_STX" xil_pn:name="reg_exmem.stx"/>
+    <file xil_pn:fileType="FILE_XST" xil_pn:name="reg_exmem.xst"/>
+    <file xil_pn:fileType="FILE_XST_PROJECT" xil_pn:name="reg_idex.prj"/>
+    <file xil_pn:fileType="FILE_XST_STX" xil_pn:name="reg_idex.stx"/>
+    <file xil_pn:fileType="FILE_XST" xil_pn:name="reg_idex.xst"/>
+    <file xil_pn:fileType="FILE_XST_PROJECT" xil_pn:name="reg_ifid.prj"/>
+    <file xil_pn:fileType="FILE_XST_STX" xil_pn:name="reg_ifid.stx"/>
+    <file xil_pn:fileType="FILE_XST" xil_pn:name="reg_ifid.xst"/>
     <file xil_pn:branch="BehavioralSim" xil_pn:fileType="FILE_MODELSIM_CMD" xil_pn:name="tb_alu.fdo"/>
     <file xil_pn:branch="BehavioralSim" xil_pn:fileType="FILE_MODELSIM_CMD" xil_pn:name="tb_toplevel.fdo"/>
     <file xil_pn:branch="Implementation" xil_pn:fileType="FILE_BITGEN_REPORT" xil_pn:name="toplevel.bgn" xil_pn:subbranch="FPGAConfiguration"/>

diff --git a/oving1/oving1.xise b/oving1/oving1.xise
@@ -129,6 +129,14 @@
       <association xil_pn:name="BehavioralSimulation"/>
       <association xil_pn:name="Implementation"/>
     </file>
+    <file xil_pn:name="reg_idex.vhd" xil_pn:type="FILE_VHDL">
+      <association xil_pn:name="BehavioralSimulation"/>
+      <association xil_pn:name="Implementation"/>
+    </file>
+    <file xil_pn:name="reg_exmem.vhd" xil_pn:type="FILE_VHDL">
+      <association xil_pn:name="BehavioralSimulation"/>
+      <association xil_pn:name="Implementation"/>
+    </file>
   </files>
 
   <autoManagedFiles>
@@ -371,8 +379,8 @@
     <property xil_pn:name="Run Design Rules Checker (DRC)" xil_pn:value="true" xil_pn:valueState="default"/>
     <property xil_pn:name="Safe Implementation" xil_pn:value="No" xil_pn:valueState="default"/>
     <property xil_pn:name="Security" xil_pn:value="Enable Readback and Reconfiguration" xil_pn:valueState="default"/>
-    <property xil_pn:name="Selected Module Instance Name" xil_pn:value="/tb_toplevel" xil_pn:valueState="non-default"/>
-    <property xil_pn:name="Selected Simulation Root Source Node Behavioral" xil_pn:value="work.tb_toplevel" xil_pn:valueState="non-default"/>
+    <property xil_pn:name="Selected Module Instance Name" xil_pn:value="/reg_ifid" xil_pn:valueState="non-default"/>
+    <property xil_pn:name="Selected Simulation Root Source Node Behavioral" xil_pn:value="work.reg_ifid" xil_pn:valueState="non-default"/>
     <property xil_pn:name="Selected Simulation Source Node" xil_pn:value="UUT" xil_pn:valueState="default"/>
     <property xil_pn:name="Set SPI Configuration Bus Width spartan6" xil_pn:value="1" xil_pn:valueState="default"/>
     <property xil_pn:name="Setup External Master Clock Division spartan6" xil_pn:value="1" xil_pn:valueState="default"/>

diff --git a/oving1/reg_exmem.lso b/oving1/reg_exmem.lso
@@ -0,0 +1 @@
+work
diff --git a/oving1/reg_exmem.prj b/oving1/reg_exmem.prj
@@ -0,0 +1 @@
+vhdl work "reg_exmem.vhd"
diff --git a/oving1/reg_exmem.stx b/oving1/reg_exmem.stx
@@ -0,0 +1,57 @@
+Release 12.4 - xst M.81d (nt64)
+Copyright (c) 1995-2010 Xilinx, Inc.  All rights reserved.
+--> Parameter TMPDIR set to C:/Users/chribru/Desktop/GitHub/tdt4255/oving1/xst/projnav.tmp
+
+
+Total REAL time to Xst completion: 0.00 secs
+Total CPU time to Xst completion: 0.09 secs
+
+--> Parameter xsthdpdir set to C:/Users/chribru/Desktop/GitHub/tdt4255/oving1/xst
+
+
+Total REAL time to Xst completion: 0.00 secs
+Total CPU time to Xst completion: 0.09 secs
+
+--> Reading design: reg_exmem.prj
+
+TABLE OF CONTENTS
+  1) Synthesis Options Summary
+  2) HDL Parsing
+  3) HDL Elaboration
+  4) HDL Synthesis
+       4.1) HDL Synthesis Report
+  5) Advanced HDL Synthesis
+       5.1) Advanced HDL Synthesis Report
+  6) Low Level Synthesis
+  7) Partition Report
+  8) Design Summary
+       8.1) Primitive and Black Box Usage
+       8.2) Device utilization summary
+       8.3) Partition Resource Summary
+       8.4) Timing Report
+            8.4.1) Clock Information
+            8.4.2) Asynchronous Control Signals Information
+            8.4.3) Timing Summary
+            8.4.4) Timing Details
+            8.4.5) Cross Clock Domains Report
+
+
+=========================================================================
+*                          HDL Parsing                                  *
+=========================================================================
+Parsing VHDL file "\Users\chribru\Desktop\GitHub\tdt4255\oving1\reg_exmem.vhd" into library work
+Parsing entity <reg_exmem>.
+Parsing architecture <Behavioral> of entity <reg_exmem>.
+
+
+Total REAL time to Xst completion: 3.00 secs
+Total CPU time to Xst completion: 3.11 secs
+
+--> 
+
+Total memory usage is 183824 kilobytes
+
+Number of errors   :    0 (   0 filtered)
+Number of warnings :    0 (   0 filtered)
+Number of infos    :    0 (   0 filtered)
+