diff options
| author |  Andrew Waterman <waterman@cs.berkeley.edu> | 2013-07-31 16:00:53 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-07-31 16:00:53 -0700 |
| commit | 157d7aafa998a05f76d33d542388e1e789bf0557 (patch) | |
| tree | 80517acf54379ef91b6175dafbb0b49d96f1f12f | |
| parent | 3b6b4ab18c45c8f8e007b46cc15c5c6cc8cc4dc3 (diff) | |
Swap J and JALR encodings
| -rw-r--r-- | inst.v | 14 | ||||
| -rw-r--r-- | instr-table.tex | 4 | ||||
| -rw-r--r-- | opcodes | 4 |
3 files changed, 11 insertions, 11 deletions
@@ -1,7 +1,7 @@ /* Automatically generated by parse-opcodes */ -`define J 32'b?????????????????????????1100111 +`define J 32'b?????????????????????????1101011 `define JAL 32'b?????????????????????????1101111 -`define JALR 32'b??????????????????????0001101011 +`define JALR 32'b??????????????????????0001100111 `define BEQ 32'b??????????????????????0001100011 `define BNE 32'b??????????????????????0011100011 `define BLT 32'b??????????????????????1001100011 @@ -91,11 +91,11 @@ `define RDCYCLE 32'b?????000000000000000001001110111 `define RDTIME 32'b?????000000000000000011001110111 `define RDINSTRET 32'b?????000000000000000101001110111 -`define CLEARPCR 32'b??????????????????????0001111011 -`define SETPCR 32'b??????????????????????0011111011 -`define MFPCR 32'b??????????0000000000000101111011 -`define MTPCR 32'b???????????????00000000111111011 -`define ERET 32'b00000000000000000000001001111011 +`define MTPCR 32'b???????????????00000000001110011 +`define MFPCR 32'b??????????0000000000000011110011 +`define SETPCR 32'b??????????????????????0101110011 +`define CLEARPCR 32'b??????????????????????0111110011 +`define ERET 32'b00000000000000000000001001110011 `define FADD_S 32'b???????????????00000???001010011 `define FSUB_S 32'b???????????????00001???001010011 `define FMUL_S 32'b???????????????00010???001010011 diff --git a/instr-table.tex b/instr-table.tex index f4393b1..f70e4a4 100644 --- a/instr-table.tex +++ b/instr-table.tex @@ -82,7 +82,7 @@ & \multicolumn{9}{|c|}{imm25} & -\multicolumn{1}{c|}{1100111} & J imm25 \\ +\multicolumn{1}{c|}{1101011} & J imm25 \\ \cline{2-11} @@ -97,7 +97,7 @@ \multicolumn{1}{c|}{rs1} & \multicolumn{5}{c|}{imm12} & \multicolumn{2}{c|}{000} & -\multicolumn{1}{c|}{1101011} & JALR rd,rs1,imm12 \\ +\multicolumn{1}{c|}{1100111} & JALR rd,rs1,imm12 \\ \cline{2-11} @@ -7,10 +7,10 @@ # <args> is one of rd, rs1, rs2, rs3, imm25, imm20, imm12, imm12lo, imm12hi, # shamtw, shamt, rm -j imm25 6..2=0x19 1..0=3 +j imm25 6..2=0x1A 1..0=3 jal imm25 6..2=0x1B 1..0=3 -jalr rd rs1 imm12 9..7=0 6..2=0x1A 1..0=3 +jalr rd rs1 imm12 9..7=0 6..2=0x19 1..0=3 beq imm12hi rs1 rs2 imm12lo 9..7=0 6..2=0x18 1..0=3 bne imm12hi rs1 rs2 imm12lo 9..7=1 6..2=0x18 1..0=3 |