OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* interp.c: Improve hashing routine to avoid long list 

traversals for common instructions.  Add HASH_STAT support.
        Rewrite opcode dispatch code using a big switch instead of
        cascaded if/else statements.  Avoid useless calls to load_mem.
This commit is contained in:
Jeff Law 1997-05-06 19:27:22 +00:00
parent 1ba1da8650
commit baa83bcc80
2 changed files with 501 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sim/mn10300/ChangeLog
View File

@ -1,3 +1,10 @@
Tue May 6 13:24:36 1997 Jeffrey A Law (law@cygnus.com)
* interp.c: Improve hashing routine to avoid long list
traversals for common instructions. Add HASH_STAT support.
Rewrite opcode dispatch code using a big switch instead of
cascaded if/else statements. Avoid useless calls to load_mem.
Mon May 5 18:07:48 1997 Jeffrey A Law (law@cygnus.com) Mon May 5 18:07:48 1997 Jeffrey A Law (law@cygnus.com)
* mn10300_sim.h (struct _state): Add space for mdrq register. * mn10300_sim.h (struct _state): Add space for mdrq register.

724
sim/mn10300/interp.c
View File

@ -17,10 +17,10 @@ int mn10300_debug;
static SIM_OPEN_KIND sim_kind; static SIM_OPEN_KIND sim_kind;
static char *myname; static char *myname;
static struct hash_entry *lookup_hash PARAMS ((uint32 ins, int)); static void dispatch PARAMS ((uint32, uint32, int));
static long hash PARAMS ((long)); static long hash PARAMS ((long));
static void init_system PARAMS ((void)); static void init_system PARAMS ((void));
#define MAX_HASH 63 #define MAX_HASH 127
struct hash_entry struct hash_entry
{ {
@ -28,6 +28,9 @@ struct hash_entry
long opcode; long opcode;
long mask; long mask;
struct simops *ops; struct simops *ops;
#ifdef HASH_STAT
unsigned long count;
#endif
}; };
struct hash_entry hash_table[MAX_HASH+1]; struct hash_entry hash_table[MAX_HASH+1];
@ -39,28 +42,51 @@ static INLINE long
hash(insn) hash(insn)
long insn; long insn;
{ {
/* These are one byte insns. */ /* These are one byte insns, we special case these since, in theory,
they should be the most heavily used. */
if ((insn & 0xffffff00) == 0) if ((insn & 0xffffff00) == 0)
{ {
if ((insn & 0xf0) == 0x00 switch (insn & 0xf0)
|| (insn & 0xf0) == 0x40) {
return (insn & 0xf3) & 0x3f; case 0x00:
return 0x70;
if ((insn & 0xf0) == 0x10 case 0x40:
|| (insn & 0xf0) == 0x30 return 0x71;
|| (insn & 0xf0) == 0x50)
return (insn & 0xfc) & 0x3f;
if ((insn & 0xf0) == 0x60 case 0x10:
|| (insn & 0xf0) == 0x70 return 0x72;
|| (insn & 0xf0) == 0x80
|| (insn & 0xf0) == 0x90
|| (insn & 0xf0) == 0xa0
|| (insn & 0xf0) == 0xb0
|| (insn & 0xf0) == 0xe0)
return (insn & 0xf0) & 0x3f;
return (insn & 0xff) & 0x3f; case 0x30:
return 0x73;
case 0x50:
return 0x74;
case 0x60:
return 0x75;
case 0x70:
return 0x76;
case 0x80:
return 0x77;
case 0x90:
return 0x78;
case 0xa0:
return 0x79;
case 0xb0:
return 0x7a;
case 0xe0:
return 0x7b;
default:
return 0x7c;
}
} }
/* These are two byte insns */ /* These are two byte insns */
@ -68,57 +94,86 @@ hash(insn)
{ {
if ((insn & 0xf000) == 0x2000 if ((insn & 0xf000) == 0x2000
|| (insn & 0xf000) == 0x5000) || (insn & 0xf000) == 0x5000)
return ((insn & 0xfc00) >> 8) & 0x3f; return ((insn & 0xfc00) >> 8) & 0x7f;
if ((insn & 0xf000) == 0x4000) if ((insn & 0xf000) == 0x4000)
return ((insn & 0xf300) >> 8) & 0x3f; return ((insn & 0xf300) >> 8) & 0x7f;
if ((insn & 0xf000) == 0x8000 if ((insn & 0xf000) == 0x8000
|| (insn & 0xf000) == 0x9000 || (insn & 0xf000) == 0x9000
|| (insn & 0xf000) == 0xa000 || (insn & 0xf000) == 0xa000
|| (insn & 0xf000) == 0xb000) || (insn & 0xf000) == 0xb000)
return ((insn & 0xf000) >> 8) & 0x3f; return ((insn & 0xf000) >> 8) & 0x7f;
return ((insn & 0xff00) >> 8) & 0x3f; if ((insn & 0xff00) == 0xf000
|| (insn & 0xff00) == 0xf100
|| (insn & 0xff00) == 0xf200
|| (insn & 0xff00) == 0xf500
|| (insn & 0xff00) == 0xf600)
return ((insn & 0xfff0) >> 4) & 0x7f;
if ((insn & 0xf000) == 0xc000)
return ((insn & 0xff00) >> 8) & 0x7f;
return ((insn & 0xffc0) >> 6) & 0x7f;
} }
/* These are three byte insns. */ /* These are three byte insns. */
if ((insn & 0xff000000) == 0) if ((insn & 0xff000000) == 0)
{ {
if ((insn & 0xf00000) == 0x000000) if ((insn & 0xf00000) == 0x000000)
return ((insn & 0xf30000) >> 16) & 0x3f; return ((insn & 0xf30000) >> 16) & 0x7f;
if ((insn & 0xf00000) == 0x200000 if ((insn & 0xf00000) == 0x200000
|| (insn & 0xf00000) == 0x300000) || (insn & 0xf00000) == 0x300000)
return ((insn & 0xfc0000) >> 16) & 0x3f; return ((insn & 0xfc0000) >> 16) & 0x7f;
return ((insn & 0xff0000) >> 16) & 0x3f; if ((insn & 0xff0000) == 0xf80000)
return ((insn & 0xfff000) >> 12) & 0x7f;
if ((insn & 0xff0000) == 0xf90000)
return ((insn & 0xfffc00) >> 10) & 0x7f;
return ((insn & 0xff0000) >> 16) & 0x7f;
} }
/* These are four byte or larger insns. */ /* These are four byte or larger insns. */
return ((insn & 0xff000000) >> 24) & 0x3f; if ((insn & 0xf0000000) == 0xf0000000)
return ((insn & 0xfff00000) >> 20) & 0x7f;
return ((insn & 0xff000000) >> 24) & 0x7f;
} }
static struct hash_entry * static void
lookup_hash (ins, length) dispatch (insn, extension, length)
uint32 ins; uint32 insn;
uint32 extension;
int length; int length;
{ {
struct hash_entry *h; struct hash_entry *h;
h = &hash_table[hash(ins)]; h = &hash_table[hash(insn)];
while ((ins & h->mask) != h->opcode while ((insn & h->mask) != h->opcode
|| (length != h->ops->length)) || (length != h->ops->length))
{ {
if (h->next == NULL) if (!h->next)
{ {
(*mn10300_callback->printf_filtered) (mn10300_callback, "ERROR looking up hash for 0x%x, PC=0x%x\n", ins, PC); (*mn10300_callback->printf_filtered) (mn10300_callback,
"ERROR looking up hash for 0x%x, PC=0x%x\n", insn, PC);
exit(1); exit(1);
} }
h = h->next; h = h->next;
} }
return (h);
#ifdef HASH_STAT
h->count++;
#endif
/* Now call the right function. */
(h->ops->func)(insn, extension);
PC += length;
} }
/* FIXME These would more efficient to use than load_mem/store_mem, /* FIXME These would more efficient to use than load_mem/store_mem,
@ -316,14 +371,28 @@ sim_open (kind,argv)
(*mn10300_callback->printf_filtered) (mn10300_callback, "ERROR: unsupported option(s): %s\n",*p); (*mn10300_callback->printf_filtered) (mn10300_callback, "ERROR: unsupported option(s): %s\n",*p);
} }
/* put all the opcodes in the hash table */ /* put all the opcodes in the hash table */
for (s = Simops; s->func; s++) for (s = Simops; s->func; s++)
{ {
h = &hash_table[hash(s->opcode)]; h = &hash_table[hash(s->opcode)];
/* go to the last entry in the chain */ /* go to the last entry in the chain */
while (h->next) while (h->next)
h = h->next; {
/* Don't insert the same opcode more than once. */
if (h->opcode == s->opcode
&& h->mask == s->mask
&& h->ops == s)
continue;
else
h = h->next;
}
/* Don't insert the same opcode more than once. */
if (h->opcode == s->opcode
&& h->mask == s->mask
&& h->ops == s)
continue;
if (h->ops) if (h->ops)
{ {
@ -333,8 +402,12 @@ sim_open (kind,argv)
h->ops = s; h->ops = s;
h->mask = s->mask; h->mask = s->mask;
h->opcode = s->opcode; h->opcode = s->opcode;
#if HASH_STAT
h->count = 0;
#endif
} }
/* fudge our descriptor for now */ /* fudge our descriptor for now */
return (SIM_DESC) 1; return (SIM_DESC) 1;
} }
@ -362,6 +435,13 @@ sim_set_profile_size (n)
(*mn10300_callback->printf_filtered) (mn10300_callback, "sim_set_profile_size %d\n", n); (*mn10300_callback->printf_filtered) (mn10300_callback, "sim_set_profile_size %d\n", n);
} }
int
sim_stop (sd)
SIM_DESC sd;
{
return 0;
}
void void
sim_resume (sd, step, siggnal) sim_resume (sd, step, siggnal)
SIM_DESC sd; SIM_DESC sd;
@ -381,212 +461,396 @@ sim_resume (sd, step, siggnal)
unsigned long insn, extension; unsigned long insn, extension;
/* Fetch the current instruction. */ /* Fetch the current instruction. */
inst = load_mem_big (PC, 1); inst = load_mem_big (PC, 2);
oldpc = PC; oldpc = PC;
/* These are one byte insns. */ /* Using a giant case statement may seem like a waste because of the
if ((inst & 0xf3) == 0x00 code/rodata size the table itself will consume. However, using
|| (inst & 0xf0) == 0x10 a giant case statement speeds up the simulator by 10-15% by avoiding
|| (inst & 0xfc) == 0x3c cascading if/else statements or cascading case statements. */
|| (inst & 0xf3) == 0x41
|| (inst & 0xf3) == 0x40 switch ((inst >> 8) & 0xff)
|| (inst & 0xfc) == 0x50
|| (inst & 0xfc) == 0x54
|| (inst & 0xf0) == 0x60
|| (inst & 0xf0) == 0x70
|| ((inst & 0xf0) == 0x80
&& (inst & 0x0c) >> 2 != (inst & 0x03))
|| ((inst & 0xf0) == 0x90
&& (inst & 0x0c) >> 2 != (inst & 0x03))
|| ((inst & 0xf0) == 0xa0
&& (inst & 0x0c) >> 2 != (inst & 0x03))
|| ((inst & 0xf0) == 0xb0
&& (inst & 0x0c) >> 2 != (inst & 0x03))
|| (inst & 0xff) == 0xcb
|| (inst & 0xfc) == 0xd0
|| (inst & 0xfc) == 0xd4
|| (inst & 0xfc) == 0xd8
|| (inst & 0xf0) == 0xe0
|| (inst & 0xff) == 0xff)
{ {
insn = inst; /* All the single byte insns except 0x80, 0x90, 0xa0, 0xb0
h = lookup_hash (insn, 1); which must be handled specially. */
extension = 0; case 0x00:
(h->ops->func)(insn, extension); case 0x04:
PC += 1; case 0x08:
} case 0x0c:
case 0x11:
case 0x12:
case 0x13:
case 0x14:
case 0x15:
case 0x16:
case 0x17:
case 0x18:
case 0x19:
case 0x1a:
case 0x1b:
case 0x1c:
case 0x1d:
case 0x1e:
case 0x1f:
case 0x3c:
case 0x3d:
case 0x3e:
case 0x3f:
case 0x40:
case 0x41:
case 0x44:
case 0x45:
case 0x48:
case 0x49:
case 0x4c:
case 0x4d:
case 0x50:
case 0x51:
case 0x52:
case 0x53:
case 0x54:
case 0x55:
case 0x56:
case 0x57:
case 0x60:
case 0x61:
case 0x62:
case 0x63:
case 0x64:
case 0x65:
case 0x66:
case 0x67:
case 0x68:
case 0x69:
case 0x6a:
case 0x6b:
case 0x6c:
case 0x6d:
case 0x6e:
case 0x6f:
case 0x70:
case 0x71:
case 0x72:
case 0x73:
case 0x74:
case 0x75:
case 0x76:
case 0x77:
case 0x78:
case 0x79:
case 0x7a:
case 0x7b:
case 0x7c:
case 0x7d:
case 0x7e:
case 0x7f:
case 0xcb:
case 0xd0:
case 0xd1:
case 0xd2:
case 0xd3:
case 0xd4:
case 0xd5:
case 0xd6:
case 0xd7:
case 0xd8:
case 0xd9:
case 0xda:
case 0xdb:
case 0xe0:
case 0xe1:
case 0xe2:
case 0xe3:
case 0xe4:
case 0xe5:
case 0xe6:
case 0xe7:
case 0xe8:
case 0xe9:
case 0xea:
case 0xeb:
case 0xec:
case 0xed:
case 0xee:
case 0xef:
case 0xff:
insn = (inst >> 8) & 0xff;
extension = 0;
dispatch (insn, extension, 1);
break;
/* These are two byte insns. */ /* Special cases where dm == dn is used to encode a different
else if ((inst & 0xf0) == 0x80 instruction. */
|| (inst & 0xf0) == 0x90 case 0x80:
|| (inst & 0xf0) == 0xa0 case 0x85:
|| (inst & 0xf0) == 0xb0 case 0x8a:
|| (inst & 0xfc) == 0x20 case 0x8f:
|| (inst & 0xfc) == 0x28 case 0x90:
|| (inst & 0xf3) == 0x43 case 0x95:
|| (inst & 0xf3) == 0x42 case 0x9a:
|| (inst & 0xfc) == 0x58 case 0x9f:
|| (inst & 0xfc) == 0x5c case 0xa0:
|| ((inst & 0xf0) == 0xc0 case 0xa5:
&& (inst & 0xff) != 0xcb case 0xaa:
&& (inst & 0xff) != 0xcc case 0xaf:
&& (inst & 0xff) != 0xcd) case 0xb0:
|| (inst & 0xff) == 0xf0 case 0xb5:
|| (inst & 0xff) == 0xf1 case 0xba:
|| (inst & 0xff) == 0xf2 case 0xbf:
|| (inst & 0xff) == 0xf3 insn = inst;
|| (inst & 0xff) == 0xf4 extension = 0;
|| (inst & 0xff) == 0xf5 dispatch (insn, extension, 2);
|| (inst & 0xff) == 0xf6) break;
{
insn = load_mem_big (PC, 2);
h = lookup_hash (insn, 2);
extension = 0;
(h->ops->func)(insn, extension);
PC += 2;
}
/* These are three byte insns. */ case 0x81:
else if ((inst & 0xff) == 0xf8 case 0x82:
|| (inst & 0xff) == 0xcc case 0x83:
|| (inst & 0xff) == 0xf9 case 0x84:
|| (inst & 0xf3) == 0x01 case 0x86:
|| (inst & 0xf3) == 0x02 case 0x87:
|| (inst & 0xf3) == 0x03 case 0x88:
|| (inst & 0xfc) == 0x24 case 0x89:
|| (inst & 0xfc) == 0x2c case 0x8b:
|| (inst & 0xfc) == 0x30 case 0x8c:
|| (inst & 0xfc) == 0x34 case 0x8d:
|| (inst & 0xfc) == 0x38 case 0x8e:
|| (inst & 0xff) == 0xde case 0x91:
|| (inst & 0xff) == 0xdf case 0x92:
|| (inst & 0xff) == 0xcc) case 0x93:
{ case 0x94:
insn = load_mem_big (PC, 3); case 0x96:
h = lookup_hash (insn, 3); case 0x97:
extension = 0; case 0x98:
/* If it's a format D1 insn, "ret", or "retf" insn, then case 0x99:
there's no need to worry about endianness. Others have case 0x9b:
a 16bit immediate in little endian form that we need to case 0x9c:
extract. */ case 0x9d:
if (h->ops->format == FMT_D1 case 0x9e:
|| h->opcode == 0xdf0000 case 0xa1:
|| h->opcode == 0xde0000) case 0xa2:
(h->ops->func)(insn, extension); case 0xa3:
else case 0xa4:
{ case 0xa6:
insn &= 0xff0000; case 0xa7:
insn |= load_mem (PC + 1, 2); case 0xa8:
(h->ops->func)(insn, extension); case 0xa9:
} case 0xab:
PC += 3; case 0xac:
} case 0xad:
case 0xae:
case 0xb1:
case 0xb2:
case 0xb3:
case 0xb4:
case 0xb6:
case 0xb7:
case 0xb8:
case 0xb9:
case 0xbb:
case 0xbc:
case 0xbd:
case 0xbe:
insn = (inst >> 8) & 0xff;
extension = 0;
dispatch (insn, extension, 1);
break;
/* These are four byte insns. */ /* The two byte instructions. */
else if ((inst & 0xff) == 0xfa case 0x20:
|| (inst & 0xff) == 0xfb) case 0x21:
{ case 0x22:
insn = load_mem_big (PC, 4); case 0x23:
h = lookup_hash (insn, 4); case 0x28:
extension = 0; case 0x29:
/* This must be a format D2 insn; a small number of such insns case 0x2a:
don't have any 16bit immediates (they instead have two 8 bit case 0x2b:
immediates). */ case 0x42:
if (h->opcode == 0xfaf80000 case 0x43:
|| h->opcode == 0xfaf00000 case 0x46:
|| h->opcode == 0xfaf40000) case 0x47:
(h->ops->func)(insn, extension); case 0x4a:
else case 0x4b:
{ case 0x4e:
insn &= 0xffff0000; case 0x4f:
insn |= load_mem (PC + 2, 2); case 0x58:
(h->ops->func)(insn, extension); case 0x59:
} case 0x5a:
PC += 4; case 0x5b:
} case 0x5c:
case 0x5d:
case 0x5e:
case 0x5f:
case 0xc0:
case 0xc1:
case 0xc2:
case 0xc3:
case 0xc4:
case 0xc5:
case 0xc6:
case 0xc7:
case 0xc8:
case 0xc9:
case 0xca:
case 0xce:
case 0xcf:
case 0xf0:
case 0xf1:
case 0xf2:
case 0xf3:
case 0xf4:
case 0xf5:
case 0xf6:
insn = inst;
extension = 0;
dispatch (insn, extension, 2);
break;
/* These are five byte insns. */ /* The three byte insns with a 16bit operand in little endian
else if ((inst & 0xff) == 0xcd format. */
|| (inst & 0xff) == 0xdc) case 0x01:
{ case 0x02:
insn = load_mem_big (PC, 4); case 0x03:
h = lookup_hash (insn, 5); case 0x05:
case 0x06:
case 0x07:
case 0x09:
case 0x0a:
case 0x0b:
case 0x0d:
case 0x0e:
case 0x0f:
case 0x24:
case 0x25:
case 0x26:
case 0x27:
case 0x2c:
case 0x2d:
case 0x2e:
case 0x2f:
case 0x30:
case 0x31:
case 0x32:
case 0x33:
case 0x34:
case 0x35:
case 0x36:
case 0x37:
case 0x38:
case 0x39:
case 0x3a:
case 0x3b:
case 0xcc:
insn = load_mem (PC, 1);
insn <<= 16;
insn |= load_mem (PC + 1, 2);
extension = 0;
dispatch (insn, extension, 3);
break;
/* This must be a format S4 insn. */ /* The three byte insns without 16bit operand. */
if (h->opcode == 0xdc000000) case 0xde:
{ case 0xdf:
/* A "jmp" instruction with a 32bit immediate stored case 0xf8:
in little endian form. */ case 0xf9:
unsigned long temp; insn = load_mem_big (PC, 3);
temp = load_mem (PC + 1, 4); extension = 0;
insn &= 0xff000000; dispatch (insn, extension, 3);
insn |= (temp & 0xffffff00) >> 8; break;
extension = temp & 0xff;
} /* Four byte insns. */
else case 0xfa:
{ case 0xfb:
/* A "call" instruction with a 16bit immediate in little if ((inst & 0xfffc) == 0xfaf0
endian form. */ || (inst & 0xfffc) == 0xfaf4
unsigned long temp; || (inst & 0xfffc) == 0xfaf8)
temp = load_mem (PC + 1, 2); insn = load_mem_big (PC, 4);
insn &= 0xff0000ff; else
insn |= temp << 8; {
extension = load_mem (PC + 4, 1); insn = inst;
} insn <<= 16;
(h->ops->func)(insn, extension); insn |= load_mem (PC + 2, 2);
PC += 5; extension = 0;
} }
dispatch (insn, extension, 4);
break;
/* These are six byte insns. */ /* Five byte insns. */
else if ((inst & 0xff) == 0xfd case 0xcd:
|| (inst & 0xff) == 0xfc) insn = load_mem (PC, 1);
{ insn <<= 24;
unsigned long temp; insn |= (load_mem (PC + 1, 2) << 8);
insn |= load_mem (PC + 3, 1);
extension = load_mem (PC + 4, 1);
dispatch (insn, extension, 5);
break;
insn = load_mem_big (PC, 4); case 0xdc:
h = lookup_hash (insn, 6); insn = load_mem (PC, 1);
insn <<= 24;
extension = load_mem (PC + 1, 4);
insn |= (extension & 0xffffff00) >> 8;
extension &= 0xff;
dispatch (insn, extension, 5);
break;
/* Six byte insns. */
case 0xfc:
case 0xfd:
insn = (inst << 16);
extension = load_mem (PC + 2, 4);
insn |= ((extension & 0xffff0000) >> 16);
extension &= 0xffff;
dispatch (insn, extension, 6);
break;
case 0xdd:
insn = load_mem (PC, 1) << 24;
extension = load_mem (PC + 1, 4);
insn |= ((extension >> 8) & 0xffffff);
extension = (extension & 0xff) << 16;
extension |= load_mem (PC + 5, 1) << 8;
extension |= load_mem (PC + 6, 1);
dispatch (insn, extension, 7);
break;
temp = load_mem (PC + 2, 4); case 0xfe:
insn &= 0xffff0000; insn = inst << 16;
insn |= (temp >> 16) & 0xffff; extension = load_mem (PC + 2, 4);
extension = temp & 0xffff; insn |= ((extension >> 16) & 0xffff);
(h->ops->func)(insn, extension); extension <<= 8;
PC += 6; extension &= 0xffff00;
} extension |= load_mem (PC + 6, 1);
dispatch (insn, extension, 7);
break;
/* Else its a seven byte insns (in theory). */ default:
else abort ();
{
insn = load_mem_big (PC, 4);
h = lookup_hash (insn, 7);
if (h->ops->format == FMT_S6)
{
unsigned long temp;
temp = load_mem (PC + 1, 4);
insn &= 0xff000000;
insn |= (temp >> 8) & 0xffffff;
extension = (temp & 0xff) << 16;
extension |= load_mem (PC + 5, 1) << 8;
extension |= load_mem (PC + 6, 1);
}
else
{
unsigned long temp;
temp = load_mem (PC + 2, 4);
insn &= 0xffff0000;
insn |= (temp >> 16) & 0xffff;
extension = (temp & 0xffff) << 8;
extension = load_mem (PC + 6, 1);
}
(h->ops->func)(insn, extension);
PC += 7;
} }
} }
while (!State.exception); while (!State.exception);
#ifdef HASH_STAT
{
int i;
for (i = 0; i < MAX_HASH; i++)
{
struct hash_entry *h;
h = &hash_table[i];
printf("hash 0x%x:\n", i);
while (h)
{
printf("h->opcode = 0x%x, count = 0x%x\n", h->opcode, h->count);
h = h->next;
}
printf("\n\n");
}
fflush (stdout);
}
#endif
} }
int int