Merge branch 'update' into 'master'

Update See merge request engintime/Dream-Logic/Project-Template/MIPS/mips-single-cycle!2

Merge branch 'update' into 'master'
8177255c · 赵鹏翀 · 17205257 · 7a24d6f3 · 8177255c · 8177255c
--- a/2mux1.dlsche
+++ b/2mux1.dlsche
--- a/2mux1.dlsche.svg
+++ b/2mux1.dlsche.svg
--- a/3mux1.dlsche
+++ b/3mux1.dlsche
--- a/3mux1.dlsche.svg
+++ b/3mux1.dlsche.svg
--- a/MIPS.dlsche
+++ b/MIPS.dlsche
--- a/MIPS.dlsche.svg
+++ b/MIPS.dlsche.svg
--- a/al_operation.dlsche
+++ b/al_operation.dlsche
--- a/al.dlsche.svg
+++ b/al.dlsche.svg
--- a/al_operation.dlsche.svg
+++ b/al_operation.dlsche.svg
--- a/alu.dlsche
+++ b/alu.dlsche
--- a/alu.dlsche.svg
+++ b/alu.dlsche.svg
--- a/alu_operand.dlsche
+++ b/alu_operand.dlsche
--- a/alu_operand.dlsche.svg
+++ b/alu_operand.dlsche.svg
--- a/compare.dlsche
+++ b/compare.dlsche
--- a/compare.dlsche.svg
+++ b/compare.dlsche.svg
--- a/control.dlsche
+++ b/control.dlsche
--- a/control.dlsche.svg
+++ b/control.dlsche.svg
--- a/extend.dlsche
+++ b/extend.dlsche
--- a/extend.dlsche.svg
+++ b/extend.dlsche.svg
--- a/mips-single-cycle.dlproj
+++ b/mips-single-cycle.dlproj
@@ -7,12 +7,12 @@
      <file relativepath="alu.dlsche"/>
      <file relativepath="compare.dlsche"/>
      <file relativepath="control.dlsche"/>
-      <file relativepath="al_operation.dlsche"/>
-      <file relativepath="extend.dlsche"/>
      <file relativepath="pc_new.dlsche"/>
      <file relativepath="alu_operand.dlsche"/>
-      <file relativepath="reg.dlsche"/>
      <file relativepath="3mux1.dlsche"/>
+      <file relativepath="al.dlsche"/>
+      <file relativepath="reg.dlsche"/>
+      <file relativepath="extend.dlsche"/>
    </filefolder>
    <filefolder id="2156f6c8-84d5-409f-859c-fddce752753a" name="存储器映射文件">
      <file relativepath="rom.rxm"/>

--- a/pc_new.dlsche
+++ b/pc_new.dlsche
--- a/pc_new.dlsche.svg
+++ b/pc_new.dlsche.svg
--- a/reg.dlsche
+++ b/reg.dlsche
--- a/reg.dlsche.svg
+++ b/reg.dlsche.svg
--- a/rom.asm
+++ b/rom.asm
@@ -19,6 +19,7 @@ sw $r3, 0($r1)          ;memory[r1+0] = r3
 sub $r1, $r1, $r0       ;r1 = r1 - r0
 add $r1, $r1, $r0       ;r1 = r1 + r0
 bne $r1, $r2, END       ;if r1 != r2, goto END
+and $r3, $r1, $r2       ;r3 = r1 & r2

 END:
 jump F1                 ;goto SHIFT

--- a/rom.dbg
+++ b/rom.dbg
--- a/rom.lst
+++ b/rom.lst
@@ -18,25 +18,26 @@
 0018                  
 0019    12    04 43   sub $r1, $r1, $r0       ;r1 = r1 - r0
 0020    14    04 42   add $r1, $r1, $r0       ;r1 = r1 + r0
-0021    16    96 00   bne $r1, $r2, END       ;if r1 != r2, goto END
-0022                  
-0023                  END:
-0024    18    B0 0E   jump F1                 ;goto SHIFT
-0025    1A    01 C4   sllv $r3, $r0, $r1      ;r3 = r0 << r1 
-0026                  
-0027                  F1:
-0028    1C    0B 83   sub $r2, $r2, $r3       ;r2 = r2 - r3
-0029    1E    AE 01   bgt $r3, $r2, F2        ;if r3 > r2, goto F2 
-0030    20    0B 82   add $r2, $r2, $r3       ;r2 = r2 + r3 
-0031                  
-0032                  F2:
-0033    22    35 03   ori  $r1, $r1, 3        ;r1 = r1 | 3
-0034    24    0D C6   srav $r3, $r3, $r1      ;r3 = r3 >> r1,   
-0035    26    49 04   andi $r1, $r2, 4        ;r1 = r2 & 4
-0036                  
-0037    28    B0 03   jump SHIFT              ;goto SHIFT
-0038                  
-0039                    
-0040                      
-0041                  
+0021    16    96 01   bne $r1, $r2, END       ;if r1 != r2, goto END
+0022    18    06 C1   and $r3, $r1, $r2       ;r3 = r1 & r2
+0023                  
+0024                  END:
+0025    1A    B0 0F   jump F1                 ;goto SHIFT
+0026    1C    01 C4   sllv $r3, $r0, $r1      ;r3 = r0 << r1 
+0027                  
+0028                  F1:
+0029    1E    0B 83   sub $r2, $r2, $r3       ;r2 = r2 - r3
+0030    20    AE 01   bgt $r3, $r2, F2        ;if r3 > r2, goto F2 
+0031    22    0B 82   add $r2, $r2, $r3       ;r2 = r2 + r3 
+0032                  
+0033                  F2:
+0034    24    35 03   ori  $r1, $r1, 3        ;r1 = r1 | 3
+0035    26    0D C6   srav $r3, $r3, $r1      ;r3 = r3 >> r1,   
+0036    28    49 04   andi $r1, $r2, 4        ;r1 = r2 & 4
+0037                  
+0038    2A    B0 03   jump SHIFT              ;goto SHIFT
+0039                  
+0040                    
+0041                      
 0042                  
+0043                  
--- a/rom.rxm
+++ b/rom.rxm