NotificationsYou must be signed in to change notification settings
Fork55
Star171

Commit4d7f54b

authored

Merge pull request#18 from robertmorelli/main

Add code field to instructions

2 parents9d1024d +83c3ff2 commit4d7f54bCopy full SHA for 4d7f54b

File tree

2 files changed

-8

lines changed

mars/mips/instructions
- BasicInstruction.java
- InstructionSet.java

2 files changed

-8

lines changed

`‎mars/mips/instructions/BasicInstruction.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,8 @@ public BasicInstruction(String example, BasicInstructionFormat instrFormat,`
`96`	`96`	`* bit position in the 32-bit machine instruction. Operation codes and`
`97`	`97`	`* unused bits are represented in the mask by 1's and 0's. Operand codes`
`98`	`98`	`* are represented by 'f', 's', and 't' for bits occupied by first, secon`
`99`		`- * and third operand, respectively.`
	`99`	`+ * and third operand, respectively. The code 'c' is used for code fields`
	`100`	`+ * which are ignored by hardware.`
`100`	`101`	`*`
`101`	`102`	`* @return The 32 bit mask, as a String`
`102`	`103`	`*/`

`‎mars/mips/instructions/InstructionSet.java‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1188,7 +1188,7 @@ public void simulate(ProgramStatement statement) throws ProcessingException`
`1188`	`1188`	`newBasicInstruction("syscall",`
`1189`	`1189`	`"Issue a system call : Execute the system call specified by value in $v0",`
`1190`	`1190`	`BasicInstructionFormat.R_FORMAT,`
`1191`		`-"00000000000 00000 00000 00000 001100",`
	`1191`	`+"000000ccccc ccccc ccccc ccccc 001100",`
`1192`	`1192`	`newSimulationCode()`
`1193`	`1193`	`{`
`1194`	`1194`	`publicvoidsimulate(ProgramStatementstatement)throwsProcessingException`
`@@ -2829,7 +2829,7 @@ public void simulate(ProgramStatement statement) throws ProcessingException`
`2829`	`2829`	`newBasicInstruction("teq $t1,$t2",`
`2830`	`2830`	`"Trap if equal : Trap if $t1 is equal to $t2",`
`2831`	`2831`	`BasicInstructionFormat.R_FORMAT,`
`2832`		`-"000000 fffff sssss00000 00000 110100",`
	`2832`	`+"000000 fffff sssssccccc ccccc 110100",`
`2833`	`2833`	`newSimulationCode()`
`2834`	`2834`	`{`
`2835`	`2835`	`publicvoidsimulate(ProgramStatementstatement)throwsProcessingException`
`@@ -2863,7 +2863,7 @@ public void simulate(ProgramStatement statement) throws ProcessingException`
`2863`	`2863`	`newBasicInstruction("tne $t1,$t2",`
`2864`	`2864`	`"Trap if not equal : Trap if $t1 is not equal to $t2",`
`2865`	`2865`	`BasicInstructionFormat.R_FORMAT,`
`2866`		`-"000000 fffff sssss00000 00000 110110",`
	`2866`	`+"000000 fffff sssssccccc ccccc 110110",`
`2867`	`2867`	`newSimulationCode()`
`2868`	`2868`	`{`
`2869`	`2869`	`publicvoidsimulate(ProgramStatementstatement)throwsProcessingException`
`@@ -2897,7 +2897,7 @@ public void simulate(ProgramStatement statement) throws ProcessingException`
`2897`	`2897`	`newBasicInstruction("tge $t1,$t2",`
`2898`	`2898`	`"Trap if greater or equal : Trap if $t1 is greater than or equal to $t2",`
`2899`	`2899`	`BasicInstructionFormat.R_FORMAT,`
`2900`		`-"000000 fffff sssss00000 00000 110000",`
	`2900`	`+"000000 fffff sssssccccc ccccc 110000",`
`2901`	`2901`	`newSimulationCode()`
`2902`	`2902`	`{`
`2903`	`2903`	`publicvoidsimulate(ProgramStatementstatement)throwsProcessingException`
`@@ -2914,7 +2914,7 @@ public void simulate(ProgramStatement statement) throws ProcessingException`
`2914`	`2914`	`newBasicInstruction("tgeu $t1,$t2",`
`2915`	`2915`	`"Trap if greater or equal unsigned : Trap if $t1 is greater than or equal to $t2 using unsigned comparision",`
`2916`	`2916`	`BasicInstructionFormat.R_FORMAT,`
`2917`		`-"000000 fffff sssss00000 00000 110001",`
	`2917`	`+"000000 fffff sssssccccc ccccc 110001",`
`2918`	`2918`	`newSimulationCode()`
`2919`	`2919`	`{`
`2920`	`2920`	`publicvoidsimulate(ProgramStatementstatement)throwsProcessingException`
`@@ -2972,7 +2972,7 @@ public void simulate(ProgramStatement statement) throws ProcessingException`
`2972`	`2972`	`newBasicInstruction("tlt $t1,$t2",`
`2973`	`2973`	`"Trap if less than: Trap if $t1 less than $t2",`
`2974`	`2974`	`BasicInstructionFormat.R_FORMAT,`
`2975`		`-"000000 fffff sssss00000 00000 110010",`
	`2975`	`+"000000 fffff sssssccccc ccccc 110010",`
`2976`	`2976`	`newSimulationCode()`
`2977`	`2977`	`{`
`2978`	`2978`	`publicvoidsimulate(ProgramStatementstatement)throwsProcessingException`
`@@ -2989,7 +2989,7 @@ public void simulate(ProgramStatement statement) throws ProcessingException`
`2989`	`2989`	`newBasicInstruction("tltu $t1,$t2",`
`2990`	`2990`	`"Trap if less than unsigned : Trap if $t1 less than $t2, unsigned comparison",`
`2991`	`2991`	`BasicInstructionFormat.R_FORMAT,`
`2992`		`-"000000 fffff sssss00000 00000 110011",`
	`2992`	`+"000000 fffff sssssccccc ccccc 110011",`
`2993`	`2993`	`newSimulationCode()`
`2994`	`2994`	`{`
`2995`	`2995`	`publicvoidsimulate(ProgramStatementstatement)throwsProcessingException`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4d7f54b

File tree

2 files changed

2 files changed

`‎mars/mips/instructions/BasicInstruction.java‎`

`‎mars/mips/instructions/InstructionSet.java‎`

0 commit comments