darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2002-12-31 Chris Demetriou <cgd@broadcom.com>

Browse source 
* sim-main.h (check_branch_bug, mark_branch_bug): Remove.
        * mips.igen: Remove all invocations of check_branch_bug and
        mark_branch_bug.
This commit is contained in:
Chris Demetriou 2002-12-31 21:31:32 +00:00
parent e78b5cfeaf
commit 28f50ac815
3 changed files with 6 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sim/mips/ChangeLog
View file

@ -1,3 +1,9 @@
2002-12-31 Chris Demetriou <cgd@broadcom.com>
* sim-main.h (check_branch_bug, mark_branch_bug): Remove.
* mips.igen: Remove all invocations of check_branch_bug and
mark_branch_bug.
2002-12-16 Chris Demetriou <cgd@broadcom.com> 2002-12-16 Chris Demetriou <cgd@broadcom.com>
* tconfig.in: Include "gdb/callback.h" and "gdb/remote-sim.h". * tconfig.in: Include "gdb/callback.h" and "gdb/remote-sim.h".

36
sim/mips/mips.igen
View file

@ -565,10 +565,8 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if ((signed_word) GPR[RS] == (signed_word) GPR[RT]) if ((signed_word) GPR[RS] == (signed_word) GPR[RT])
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
} }
@ -588,10 +586,8 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if ((signed_word) GPR[RS] == (signed_word) GPR[RT]) if ((signed_word) GPR[RS] == (signed_word) GPR[RT])
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
else else
@ -614,10 +610,8 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if ((signed_word) GPR[RS] >= 0) if ((signed_word) GPR[RS] >= 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
} }
@ -638,13 +632,11 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if (RS == 31) if (RS == 31)
Unpredictable (); Unpredictable ();
RA = (CIA + 8); RA = (CIA + 8);
if ((signed_word) GPR[RS] >= 0) if ((signed_word) GPR[RS] >= 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
} }
@ -664,7 +656,6 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if (RS == 31) if (RS == 31)
Unpredictable (); Unpredictable ();
RA = (CIA + 8); RA = (CIA + 8);
@ -672,7 +663,6 @@
executed */ executed */
if ((signed_word) GPR[RS] >= 0) if ((signed_word) GPR[RS] >= 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
else else
@ -694,10 +684,8 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if ((signed_word) GPR[RS] >= 0) if ((signed_word) GPR[RS] >= 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
else else
@ -720,10 +708,8 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if ((signed_word) GPR[RS] > 0) if ((signed_word) GPR[RS] > 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
} }
@ -743,12 +729,10 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
/* NOTE: The branch occurs AFTER the next instruction has been /* NOTE: The branch occurs AFTER the next instruction has been
executed */ executed */
if ((signed_word) GPR[RS] > 0) if ((signed_word) GPR[RS] > 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
else else
@ -771,12 +755,10 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
/* NOTE: The branch occurs AFTER the next instruction has been /* NOTE: The branch occurs AFTER the next instruction has been
executed */ executed */
if ((signed_word) GPR[RS] <= 0) if ((signed_word) GPR[RS] <= 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
} }
@ -796,10 +778,8 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if ((signed_word) GPR[RS] <= 0) if ((signed_word) GPR[RS] <= 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
else else
@ -822,10 +802,8 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if ((signed_word) GPR[RS] < 0) if ((signed_word) GPR[RS] < 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
} }
@ -846,7 +824,6 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if (RS == 31) if (RS == 31)
Unpredictable (); Unpredictable ();
RA = (CIA + 8); RA = (CIA + 8);
@ -854,7 +831,6 @@
executed */ executed */
if ((signed_word) GPR[RS] < 0) if ((signed_word) GPR[RS] < 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
} }
@ -874,13 +850,11 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if (RS == 31) if (RS == 31)
Unpredictable (); Unpredictable ();
RA = (CIA + 8); RA = (CIA + 8);
if ((signed_word) GPR[RS] < 0) if ((signed_word) GPR[RS] < 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
else else
@ -902,12 +876,10 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
/* NOTE: The branch occurs AFTER the next instruction has been /* NOTE: The branch occurs AFTER the next instruction has been
executed */ executed */
if ((signed_word) GPR[RS] < 0) if ((signed_word) GPR[RS] < 0)
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
else else
@ -930,10 +902,8 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if ((signed_word) GPR[RS] != (signed_word) GPR[RT]) if ((signed_word) GPR[RS] != (signed_word) GPR[RT])
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
} }
@ -953,10 +923,8 @@
*r3900: *r3900:
{ {
address_word offset = EXTEND16 (OFFSET) << 2; address_word offset = EXTEND16 (OFFSET) << 2;
check_branch_bug ();
if ((signed_word) GPR[RS] != (signed_word) GPR[RT]) if ((signed_word) GPR[RS] != (signed_word) GPR[RT])
{ {
mark_branch_bug (NIA+offset);
DELAY_SLOT (NIA + offset); DELAY_SLOT (NIA + offset);
} }
else else
@ -3792,13 +3760,11 @@
*mipsIII: *mipsIII:
{ {
check_fpu (SD_); check_fpu (SD_);
check_branch_bug ();
TRACE_BRANCH_INPUT (PREVCOC1()); TRACE_BRANCH_INPUT (PREVCOC1());
if (PREVCOC1() == TF) if (PREVCOC1() == TF)
{ {
address_word dest = NIA + (EXTEND16 (OFFSET) << 2); address_word dest = NIA + (EXTEND16 (OFFSET) << 2);
TRACE_BRANCH_RESULT (dest); TRACE_BRANCH_RESULT (dest);
mark_branch_bug (dest);
DELAY_SLOT (dest); DELAY_SLOT (dest);
} }
else if (ND) else if (ND)
@ -3824,11 +3790,9 @@
*r3900: *r3900:
{ {
check_fpu (SD_); check_fpu (SD_);
check_branch_bug ();
if (GETFCC(CC) == TF) if (GETFCC(CC) == TF)
{ {
address_word dest = NIA + (EXTEND16 (OFFSET) << 2); address_word dest = NIA + (EXTEND16 (OFFSET) << 2);
mark_branch_bug (dest);
DELAY_SLOT (dest); DELAY_SLOT (dest);
} }
else if (ND) else if (ND)

4
sim/mips/sim-main.h
View file

@ -423,10 +423,6 @@ struct _sim_cpu {
hilo_history lo_history; hilo_history lo_history;
#define LOHISTORY (&(CPU)->lo_history) #define LOHISTORY (&(CPU)->lo_history)
#define check_branch_bug()
#define mark_branch_bug(TARGET)
sim_cpu_base base; sim_cpu_base base;
}; };