From c7583da0b6ef488954a9c299d95452e5e081e22e Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Sun, 23 Feb 1997 04:06:51 +0000 Subject: [PATCH] * tic80-opc.c (tic80_predefined_symbols): Revert change to store BITNUM values in the table in one's complement form to match behavior when assembler is given a raw numeric value for a BITNUM operand. * tic80-dis.c (print_operand_bitnum): Ditto. --- opcodes/ChangeLog | 10 ++++++ opcodes/tic80-opc.c | 84 ++++++++++++++++++++++----------------------- 2 files changed, 52 insertions(+), 42 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index f630e3c8bbb..5e689088c62 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,13 @@ +start-sanitize-tic80 +Sat Feb 22 21:03:47 1997 Fred Fish + + * tic80-opc.c (tic80_predefined_symbols): Revert change to + store BITNUM values in the table in one's complement form + to match behavior when assembler is given a raw numeric + value for a BITNUM operand. + * tic80-dis.c (print_operand_bitnum): Ditto. + +end-sanitize-tic80 start-sanitize-d30v Fri Feb 21 16:31:18 1997 Martin M. Hunt diff --git a/opcodes/tic80-opc.c b/opcodes/tic80-opc.c index 2a534126da8..20181105bd7 100644 --- a/opcodes/tic80-opc.c +++ b/opcodes/tic80-opc.c @@ -79,10 +79,10 @@ const struct predefined_symbol tic80_predefined_symbols[] = { "ECOMCNTL", TIC80_OPERAND_CR | 0x33 }, { "EIP", TIC80_OPERAND_CR | 1 }, { "EPC", TIC80_OPERAND_CR | 0 }, - { "eq.b", TIC80_OPERAND_BITNUM | (~0 & 0x1F) }, - { "eq.f", TIC80_OPERAND_BITNUM | (~20 & 0x1F) }, - { "eq.h", TIC80_OPERAND_BITNUM | (~10 & 0x1F) }, - { "eq.w", TIC80_OPERAND_BITNUM | (~20 & 0x1F) }, + { "eq.b", TIC80_OPERAND_BITNUM | 0 }, + { "eq.f", TIC80_OPERAND_BITNUM | 20 }, + { "eq.h", TIC80_OPERAND_BITNUM | 10 }, + { "eq.w", TIC80_OPERAND_BITNUM | 20 }, { "eq0.b", TIC80_OPERAND_CC | 2 }, { "eq0.h", TIC80_OPERAND_CC | 10 }, { "eq0.w", TIC80_OPERAND_CC | 18 }, @@ -92,30 +92,30 @@ const struct predefined_symbol tic80_predefined_symbols[] = { "FLTOP", TIC80_OPERAND_CR | 0x10 }, { "FLTTAG", TIC80_OPERAND_CR | 0x12 }, { "FPST", TIC80_OPERAND_CR | 8 }, - { "ge.b", TIC80_OPERAND_BITNUM | (~5 & 0x1F) }, - { "ge.f", TIC80_OPERAND_BITNUM | (~25 & 0x1F) }, - { "ge.h", TIC80_OPERAND_BITNUM | (~15 & 0x1F) }, - { "ge.w", TIC80_OPERAND_BITNUM | (~25 & 0x1F) }, + { "ge.b", TIC80_OPERAND_BITNUM | 5 }, + { "ge.f", TIC80_OPERAND_BITNUM | 25 }, + { "ge.h", TIC80_OPERAND_BITNUM | 15 }, + { "ge.w", TIC80_OPERAND_BITNUM | 25 }, { "ge0.b", TIC80_OPERAND_CC | 3 }, { "ge0.h", TIC80_OPERAND_CC | 11 }, { "ge0.w", TIC80_OPERAND_CC | 19 }, - { "gt.b", TIC80_OPERAND_BITNUM | (~2 & 0x1F) }, - { "gt.f", TIC80_OPERAND_BITNUM | (~22 & 0x1F) }, - { "gt.h", TIC80_OPERAND_BITNUM | (~12 & 0x1F) }, - { "gt.w", TIC80_OPERAND_BITNUM | (~22 & 0x1F) }, + { "gt.b", TIC80_OPERAND_BITNUM | 2 }, + { "gt.f", TIC80_OPERAND_BITNUM | 22 }, + { "gt.h", TIC80_OPERAND_BITNUM | 12 }, + { "gt.w", TIC80_OPERAND_BITNUM | 22 }, { "gt0.b", TIC80_OPERAND_CC | 1 }, { "gt0.h", TIC80_OPERAND_CC | 9 }, { "gt0.w", TIC80_OPERAND_CC | 17 }, - { "hi.b", TIC80_OPERAND_BITNUM | (~6 & 0x1F) }, - { "hi.h", TIC80_OPERAND_BITNUM | (~16 & 0x1F) }, - { "hi.w", TIC80_OPERAND_BITNUM | (~26 & 0x1F) }, - { "hs.b", TIC80_OPERAND_BITNUM | (~9 & 0x1F) }, - { "hs.h", TIC80_OPERAND_BITNUM | (~19 & 0x1F) }, - { "hs.w", TIC80_OPERAND_BITNUM | (~29 & 0x1F) }, - { "ib.f", TIC80_OPERAND_BITNUM | (~28 & 0x1F) }, + { "hi.b", TIC80_OPERAND_BITNUM | 6 }, + { "hi.h", TIC80_OPERAND_BITNUM | 16 }, + { "hi.w", TIC80_OPERAND_BITNUM | 26 }, + { "hs.b", TIC80_OPERAND_BITNUM | 9 }, + { "hs.h", TIC80_OPERAND_BITNUM | 19 }, + { "hs.w", TIC80_OPERAND_BITNUM | 29 }, + { "ib.f", TIC80_OPERAND_BITNUM | 28 }, { "IE", TIC80_OPERAND_CR | 6 }, { "ILRU", TIC80_OPERAND_CR | 0x300 }, - { "in.f", TIC80_OPERAND_BITNUM | (~27 & 0x1F) }, + { "in.f", TIC80_OPERAND_BITNUM | 27 }, { "IN0P", TIC80_OPERAND_CR | 0x4000 }, { "IN1P", TIC80_OPERAND_CR | 0x4001 }, { "INTPEN", TIC80_OPERAND_CR | 4 }, @@ -135,41 +135,41 @@ const struct predefined_symbol tic80_predefined_symbols[] = { "ITAG7", TIC80_OPERAND_CR | 0x207 }, { "ITAG8", TIC80_OPERAND_CR | 0x208 }, { "ITAG9", TIC80_OPERAND_CR | 0x209 }, - { "le.b", TIC80_OPERAND_BITNUM | (~3 & 0x1F) }, - { "le.f", TIC80_OPERAND_BITNUM | (~23 & 0x1F) }, - { "le.h", TIC80_OPERAND_BITNUM | (~13 & 0x1F) }, - { "le.w", TIC80_OPERAND_BITNUM | (~23 & 0x1F) }, + { "le.b", TIC80_OPERAND_BITNUM | 3 }, + { "le.f", TIC80_OPERAND_BITNUM | 23 }, + { "le.h", TIC80_OPERAND_BITNUM | 13 }, + { "le.w", TIC80_OPERAND_BITNUM | 23 }, { "le0.b", TIC80_OPERAND_CC | 6 }, { "le0.h", TIC80_OPERAND_CC | 14 }, { "le0.w", TIC80_OPERAND_CC | 22 }, - { "lo.b", TIC80_OPERAND_BITNUM | (~8 & 0x1F) }, - { "lo.h", TIC80_OPERAND_BITNUM | (~18 & 0x1F) }, - { "lo.w", TIC80_OPERAND_BITNUM | (~28 & 0x1F) }, - { "ls.b", TIC80_OPERAND_BITNUM | (~7 & 0x1F) }, - { "ls.h", TIC80_OPERAND_BITNUM | (~17 & 0x1F) }, - { "ls.w", TIC80_OPERAND_BITNUM | (~27 & 0x1F) }, - { "lt.b", TIC80_OPERAND_BITNUM | (~4 & 0x1F) }, - { "lt.f", TIC80_OPERAND_BITNUM | (~24 & 0x1F) }, - { "lt.h", TIC80_OPERAND_BITNUM | (~14 & 0x1F) }, - { "lt.w", TIC80_OPERAND_BITNUM | (~24 & 0x1F) }, + { "lo.b", TIC80_OPERAND_BITNUM | 8 }, + { "lo.h", TIC80_OPERAND_BITNUM | 18 }, + { "lo.w", TIC80_OPERAND_BITNUM | 28 }, + { "ls.b", TIC80_OPERAND_BITNUM | 7 }, + { "ls.h", TIC80_OPERAND_BITNUM | 17 }, + { "ls.w", TIC80_OPERAND_BITNUM | 27 }, + { "lt.b", TIC80_OPERAND_BITNUM | 4 }, + { "lt.f", TIC80_OPERAND_BITNUM | 24 }, + { "lt.h", TIC80_OPERAND_BITNUM | 14 }, + { "lt.w", TIC80_OPERAND_BITNUM | 24 }, { "lt0.b", TIC80_OPERAND_CC | 4 }, { "lt0.h", TIC80_OPERAND_CC | 12 }, { "lt0.w", TIC80_OPERAND_CC | 20 }, { "MIP", TIC80_OPERAND_CR | 0x31 }, { "MPC", TIC80_OPERAND_CR | 0x30 }, - { "ne.b", TIC80_OPERAND_BITNUM | (~1 & 0x1F) }, - { "ne.f", TIC80_OPERAND_BITNUM | (~21 & 0x1F) }, - { "ne.h", TIC80_OPERAND_BITNUM | (~11 & 0x1F) }, - { "ne.w", TIC80_OPERAND_BITNUM | (~21 & 0x1F) }, + { "ne.b", TIC80_OPERAND_BITNUM | 1 }, + { "ne.f", TIC80_OPERAND_BITNUM | 21 }, + { "ne.h", TIC80_OPERAND_BITNUM | 11 }, + { "ne.w", TIC80_OPERAND_BITNUM | 21 }, { "ne0.b", TIC80_OPERAND_CC | 5 }, { "ne0.h", TIC80_OPERAND_CC | 13 }, { "ne0.w", TIC80_OPERAND_CC | 21 }, { "nev.b", TIC80_OPERAND_CC | 0 }, { "nev.h", TIC80_OPERAND_CC | 8 }, { "nev.w", TIC80_OPERAND_CC | 16 }, - { "ob.f", TIC80_OPERAND_BITNUM | (~29 & 0x1F) }, - { "or.f", TIC80_OPERAND_BITNUM | (~31 & 0x1F) }, - { "ou.f", TIC80_OPERAND_BITNUM | (~26 & 0x1F) }, + { "ob.f", TIC80_OPERAND_BITNUM | 29 }, + { "or.f", TIC80_OPERAND_BITNUM | 31 }, + { "ou.f", TIC80_OPERAND_BITNUM | 26 }, { "OUTP", TIC80_OPERAND_CR | 0x4002 }, { "PKTREQ", TIC80_OPERAND_CR | 0xD }, { "PPERROR", TIC80_OPERAND_CR | 0xA }, @@ -209,7 +209,7 @@ const struct predefined_symbol tic80_predefined_symbols[] = { "SYSTMP", TIC80_OPERAND_CR | 0x21 }, { "TCOUNT", TIC80_OPERAND_CR | 0xE }, { "TSCALE", TIC80_OPERAND_CR | 0xF }, - { "uo.f", TIC80_OPERAND_BITNUM | (~30 & 0x1F) }, + { "uo.f", TIC80_OPERAND_BITNUM | 30 }, }; const int tic80_num_predefined_symbols = sizeof (tic80_predefined_symbols) / sizeof (struct predefined_symbol); -- 2.30.2