diff options
Diffstat (limited to 'sim/sh64/defs-media.h')
| -rw-r--r-- | sim/sh64/defs-media.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sim/sh64/defs-media.h b/sim/sh64/defs-media.h index 91b95e4..03deb1f 100644 --- a/sim/sh64/defs-media.h +++ b/sim/sh64/defs-media.h @@ -194,7 +194,7 @@ struct scache { length = 4; \ f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ - f_disp10 = EXTRACT_MSB0_INT (insn, 32, 12, 10); \ + f_disp10 = EXTRACT_MSB0_SINT (insn, 32, 12, 10); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -211,7 +211,7 @@ struct scache { f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ f_ext = EXTRACT_MSB0_UINT (insn, 32, 12, 4); \ - f_disp6x32 = ((EXTRACT_MSB0_INT (insn, 32, 16, 6)) << (5)); \ + f_disp6x32 = ((EXTRACT_MSB0_SINT (insn, 32, 16, 6)) << (5)); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -251,7 +251,7 @@ struct scache { f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ f_ext = EXTRACT_MSB0_UINT (insn, 32, 12, 4); \ - f_imm6 = EXTRACT_MSB0_INT (insn, 32, 16, 6); \ + f_imm6 = EXTRACT_MSB0_SINT (insn, 32, 16, 6); \ f_likely = EXTRACT_MSB0_UINT (insn, 32, 22, 1); \ f_23_2 = EXTRACT_MSB0_UINT (insn, 32, 23, 2); \ f_tra = EXTRACT_MSB0_UINT (insn, 32, 25, 3); \ @@ -499,7 +499,7 @@ struct scache { length = 4; \ f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ - f_disp10x8 = ((EXTRACT_MSB0_INT (insn, 32, 12, 10)) << (3)); \ + f_disp10x8 = ((EXTRACT_MSB0_SINT (insn, 32, 12, 10)) << (3)); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -514,7 +514,7 @@ struct scache { length = 4; \ f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ - f_disp10x8 = ((EXTRACT_MSB0_INT (insn, 32, 12, 10)) << (3)); \ + f_disp10x8 = ((EXTRACT_MSB0_SINT (insn, 32, 12, 10)) << (3)); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -529,7 +529,7 @@ struct scache { length = 4; \ f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ - f_disp10x4 = ((EXTRACT_MSB0_INT (insn, 32, 12, 10)) << (2)); \ + f_disp10x4 = ((EXTRACT_MSB0_SINT (insn, 32, 12, 10)) << (2)); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -688,7 +688,7 @@ struct scache { f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ f_ext = EXTRACT_MSB0_UINT (insn, 32, 12, 4); \ - f_disp6 = EXTRACT_MSB0_INT (insn, 32, 16, 6); \ + f_disp6 = EXTRACT_MSB0_SINT (insn, 32, 16, 6); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -720,7 +720,7 @@ struct scache { length = 4; \ f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ - f_disp10x4 = ((EXTRACT_MSB0_INT (insn, 32, 12, 10)) << (2)); \ + f_disp10x4 = ((EXTRACT_MSB0_SINT (insn, 32, 12, 10)) << (2)); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -735,7 +735,7 @@ struct scache { length = 4; \ f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ - f_disp10x8 = ((EXTRACT_MSB0_INT (insn, 32, 12, 10)) << (3)); \ + f_disp10x8 = ((EXTRACT_MSB0_SINT (insn, 32, 12, 10)) << (3)); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -765,7 +765,7 @@ struct scache { #define EXTRACT_IFMT_MOVI_CODE \ length = 4; \ f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ - f_imm16 = EXTRACT_MSB0_INT (insn, 32, 6, 16); \ + f_imm16 = EXTRACT_MSB0_SINT (insn, 32, 6, 16); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -780,7 +780,7 @@ struct scache { length = 4; \ f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ - f_imm10 = EXTRACT_MSB0_INT (insn, 32, 12, 10); \ + f_imm10 = EXTRACT_MSB0_SINT (insn, 32, 12, 10); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -797,7 +797,7 @@ struct scache { f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ f_ext = EXTRACT_MSB0_UINT (insn, 32, 12, 4); \ - f_disp6x32 = ((EXTRACT_MSB0_INT (insn, 32, 16, 6)) << (5)); \ + f_disp6x32 = ((EXTRACT_MSB0_SINT (insn, 32, 16, 6)) << (5)); \ f_right = EXTRACT_MSB0_UINT (insn, 32, 16, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ @@ -812,7 +812,7 @@ struct scache { #define EXTRACT_IFMT_PTA_CODE \ length = 4; \ f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ - f_disp16 = ((((EXTRACT_MSB0_INT (insn, 32, 6, 16)) << (2))) + (pc)); \ + f_disp16 = ((((EXTRACT_MSB0_SINT (insn, 32, 6, 16)) << (2))) + (pc)); \ f_likely = EXTRACT_MSB0_UINT (insn, 32, 22, 1); \ f_23_2 = EXTRACT_MSB0_UINT (insn, 32, 23, 2); \ f_tra = EXTRACT_MSB0_UINT (insn, 32, 25, 3); \ @@ -897,7 +897,7 @@ struct scache { length = 4; \ f_op = EXTRACT_MSB0_UINT (insn, 32, 0, 6); \ f_left = EXTRACT_MSB0_UINT (insn, 32, 6, 6); \ - f_disp10x2 = ((EXTRACT_MSB0_INT (insn, 32, 12, 10)) << (1)); \ + f_disp10x2 = ((EXTRACT_MSB0_SINT (insn, 32, 12, 10)) << (1)); \ f_dest = EXTRACT_MSB0_UINT (insn, 32, 22, 6); \ f_rsvd = EXTRACT_MSB0_UINT (insn, 32, 28, 4); \ |