URL
https://opencores.org/ocsvn/openrisc/openrisc/trunk
Subversion Repositories openrisc
Compare Revisions
- This comparison shows the changes necessary to convert path
/openrisc/trunk/or1ksim/cuc
- from Rev 226 to Rev 230
- ↔ Reverse comparison
Rev 226 → Rev 230
/load.c
189,7 → 189,7
{ |
const char *name; |
char *s; |
int index = insn_decode (data); |
int index = or1ksim_insn_decode (data); |
struct or32_opcode const *opcode; |
int i, argc = 0; |
|
196,10 → 196,10
insn->insn = data; |
insn->index = -1; |
insn->type = 0; |
name = insn_name (index); |
name = or1ksim_insn_name (index); |
insn->index = index; |
disassemble_index (data, index); |
strcpy (insn->disasm, disassembled); |
or1ksim_disassemble_index (data, index); |
strcpy (insn->disasm, or1ksim_disassembled); |
insn->dep = NULL; |
for (i = 0; i < MAX_OPERANDS; i++) insn->opt[i] = OPT_NONE; |
|
207,7 → 207,7
fprintf (stderr, "Invalid opcode 0x%08lx!\n", data); |
exit (1); |
} |
opcode = &or32_opcodes[index]; |
opcode = &or1ksim_or32_opcodes[index]; |
|
for (s = opcode->args; *s != '\0'; ++s) { |
switch (*s) { |
214,13 → 214,13
case '\0': return name; |
case 'r': |
insn->opt[argc] = OPT_REGISTER | (argc ? 0 : OPT_DEST); |
insn->op[argc++] = or32_extract(*++s, opcode->encoding, data); |
insn->op[argc++] = or1ksim_or32_extract(*++s, opcode->encoding, data); |
break; |
|
default: |
if (strchr (opcode->encoding, *s)) { |
unsigned long imm = or32_extract (*s, opcode->encoding, data); |
imm = extend_imm(imm, *s); |
unsigned long imm = or1ksim_or32_extract (*s, opcode->encoding, data); |
imm = or1ksim_extend_imm(imm, *s); |
insn->opt[argc] = OPT_CONST; |
insn->op[argc++] = imm; |
} |
436,7 → 436,7
if (func_return) func_return++; |
//PRINTF ("%s\n", name); |
|
if (or32_opcodes[insn[i].index].flags & OR32_IF_DELAY) { |
if (or1ksim_or32_opcodes[insn[i].index].flags & OR32_IF_DELAY) { |
int f; |
if (strcmp (name, "l.bnf") == 0) f = 1; |
else if (strcmp (name, "l.bf") == 0) f = 0; |
/Makefile.in
1,4 → 1,4
# Makefile.in generated by automake 1.11 from Makefile.am. |
# Makefile.in generated by automake 1.11.1 from Makefile.am. |
# @configure_input@ |
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
153,7 → 153,6
PACKAGE_NAME = @PACKAGE_NAME@ |
PACKAGE_STRING = @PACKAGE_STRING@ |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
PACKAGE_URL = @PACKAGE_URL@ |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
POW_LIB = @POW_LIB@ |
/cuc.c
592,11 → 592,11
do |
{ |
unsigned long d = eval_direct32 (a, 0, 0); |
int index = insn_decode (d); |
int index = or1ksim_insn_decode (d); |
assert (index >= 0); |
if (x) |
x++; |
if (strcmp (insn_name (index), "l.jr") == 0) |
if (strcmp (or1ksim_insn_name (index), "l.jr") == 0) |
x = 1; |
a += 4; |
fprintf (fo, "%08lx\n", d); |