Clean up tracing for Bcond & jmp insns.

Fix computation of disp16 and disp22.
Clean up tracing of sld* insns.

1 files changed, 0 insertions, 240 deletions

diff --git a/sim/v850/simops.c b/sim/v850/simops.c
index c739d60..543ab91 100644
--- a/sim/v850/simops.c
+++ b/sim/v850/simops.c
@@ -455,77 +455,6 @@ fetch_argv (sd, addr)
 }
 
 
-/* sld.b */
-int
-OP_300 ()
-{
-  unsigned long result;
-  
-  result = load_mem (State.regs[30] + (OP[3] & 0x7f), 1);
-
-/* start-sanitize-v850eq */
-  if (PSW & PSW_US)
-    {
-      trace_input ("sld.bu", OP_LOAD16, 1);
-      State.regs[ OP[1] ] = result;
-    }
-  else
-    {
-/* end-sanitize-v850eq */
-  trace_input ("sld.b", OP_LOAD16, 1);
-  
-  State.regs[ OP[1] ] = EXTEND8 (result);
-/* start-sanitize-v850eq */
-    }
-/* end-sanitize-v850eq */
-  
-  trace_output (OP_LOAD16);
-  
-  return 2;
-}
-
-/* sld.h */
-int
-OP_400 ()
-{
-  unsigned long result;
-  
-  result = load_mem (State.regs[30] + ((OP[3] & 0x7f) << 1), 2);
-
-/* start-sanitize-v850eq */
-  if (PSW & PSW_US)
-    {
-      trace_input ("sld.hu", OP_LOAD16, 2);
-      State.regs[ OP[1] ] = result;
-    }
-  else
-    {
-/* end-sanitize-v850eq */
-  trace_input ("sld.h", OP_LOAD16, 2);
-  
-  State.regs[ OP[1] ] = EXTEND16 (result);
-/* start-sanitize-v850eq */
-    }
-/* end-sanitize-v850eq */
-  
-  trace_output (OP_LOAD16);
-
-  return 2;
-}
-
-/* sld.w */
-int
-OP_500 ()
-{
-  trace_input ("sld.w", OP_LOAD16, 4);
-  
-  State.regs[ OP[1] ] = load_mem (State.regs[30] + ((OP[3] & 0x7f) << 1), 4);
-  
-  trace_output (OP_LOAD16);
-  
-  return 2;
-}
-
 /* sst.b */
 int
 OP_380 ()
@@ -667,144 +596,6 @@ OP_10760 ()
   return 4;
 }
 
-static int
-branch (int code)
-{
-  trace_input ("Bcond", OP_COND_BR, 0);
-  trace_output (OP_COND_BR);
-
-  if (condition_met (code))
-    return SEXT9 (((OP[3] & 0x70) >> 3) | ((OP[3] & 0xf800) >> 7));
-  else
-    return 2;
-}
-
-/* bv disp9 */
-int
-OP_580 ()
-{
-  return branch (0);
-}
-
-/* bl disp9 */
-int
-OP_581 ()
-{
-  return branch (1);
-}
-
-/* be disp9 */
-int
-OP_582 ()
-{
-  return branch (2);
-}
-
-/* bnh disp 9*/
-int
-OP_583 ()
-{
-  return branch (3);
-}
-
-/* bn disp9 */
-int
-OP_584 ()
-{
-  return branch (4);
-}
-
-/* br disp9 */
-int
-OP_585 ()
-{
-  return branch (5);
-}
-
-/* blt disp9 */
-int
-OP_586 ()
-{
-  return branch (6);
-}
-
-/* ble disp9 */
-int
-OP_587 ()
-{
-  return branch (7);
-}
-
-/* bnv disp9 */
-int
-OP_588 ()
-{
-  return branch (8);
-}
-
-/* bnl disp9 */
-int
-OP_589 ()
-{
-  return branch (9);
-}
-
-/* bne disp9 */
-int
-OP_58A ()
-{
-  return branch (10);
-}
-
-/* bh disp9 */
-int
-OP_58B ()
-{
-  return branch (11);
-}
-
-/* bp disp9 */
-int
-OP_58C ()
-{
-  return branch (12);
-}
-
-/* bsa disp9 */
-int
-OP_58D ()
-{
-  return branch (13);
-}
-
-/* bge disp9 */
-int
-OP_58E ()
-{
-  return branch (14);
-}
-
-/* bgt disp9 */
-int
-OP_58F ()
-{
-  return branch (15);
-}
-
-/* jarl/jr disp22, reg */
-int
-OP_780 ()
-{
-  trace_input ("jarl/jr", OP_JUMP, 0);
-
-  if (OP[ 1 ] != 0)
-    State.regs[ OP[1] ] = PC + 4;
-  
-  trace_output (OP_JUMP);
-  
-  return SEXT22 (((OP[3] & 0x3f) << 16) | OP[2]);
-}
-
 /* add reg, reg */
 int
 OP_1C0 ()
@@ -2851,37 +2642,6 @@ OP_30780 (void)
 
 /* end-sanitize-v850e */
 /* start-sanitize-v850e */
-/* sld.hu */
-int
-OP_70 (void)
-{
-  unsigned long result;
-  
-  result  = load_mem (State.regs[30] + ((OP[3] & 0xf) << 1), 2);
-
-  /* start-sanitize-v850eq */
-  if (PSW & PSW_US)
-    {
-      trace_input ("sld.h", OP_LOAD16, 2);
-      State.regs[ OP[1] ] = EXTEND16 (result);
-    }
-  else
-    {
-/* end-sanitize-v850eq */
-  trace_input ("sld.hu", OP_LOAD16, 2);
-  
-  State.regs[ OP[1] ] = result;
-/* start-sanitize-v850eq */
-    }
-/* end-sanitize-v850eq */
-  
-  trace_output (OP_LOAD16);
-  
-  return 2;
-}
-
-/* end-sanitize-v850e */
-/* start-sanitize-v850e */
 /* mul reg1, reg2, reg3 */
 int
 OP_22007E0 (void)