diff options
| -rw-r--r-- | cpu/ChangeLog | 6 | ||||
| -rwxr-xr-x | cpu/epiphany.opc | 8 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 2 | ||||
| -rw-r--r-- | opcodes/epiphany-asm.c | 6 | ||||
| -rw-r--r-- | opcodes/epiphany-opc.h | 2 |
5 files changed, 16 insertions, 8 deletions
diff --git a/cpu/ChangeLog b/cpu/ChangeLog index 857a81e..d04a554 100644 --- a/cpu/ChangeLog +++ b/cpu/ChangeLog @@ -1,3 +1,9 @@ +2011-10-26 Joern Rennecke <joern.rennecke@embecosm.com> + + * epiphany.opc (parse_branch_addr): Fix type of valuep. + Cast value before printing it as a long. + (parse_postindex): Fix type of valuep. + 2011-10-25 Joern Rennecke <joern.rennecke@embecosm.com> * cpu/epiphany.cpu: New file. diff --git a/cpu/epiphany.opc b/cpu/epiphany.opc index 22e2f76..df81f30 100755 --- a/cpu/epiphany.opc +++ b/cpu/epiphany.opc @@ -78,7 +78,7 @@ extern const char * parse_branch_addr (CGEN_CPU_DESC cd, int opindex, int opinfo, enum cgen_parse_operand_result * resultp, - unsigned long * valuep); + bfd_vma *valuep); /* Allows reason codes to be output when assembler errors occur. */ #define CGEN_VERBOSE_ASSEMBLER_ERRORS @@ -172,7 +172,7 @@ static const char * parse_postindex (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED, const char ** strp, int opindex ATTRIBUTE_UNUSED, - bfd_vma * valuep) + unsigned long *valuep) { if (**strp == '#') ++*strp; /* Skip leading hashes. */ @@ -288,7 +288,7 @@ parse_branch_addr (CGEN_CPU_DESC cd, int opindex, int opinfo ATTRIBUTE_UNUSED, enum cgen_parse_operand_result * resultp ATTRIBUTE_UNUSED, - unsigned long * valuep ATTRIBUTE_UNUSED) + bfd_vma *valuep ATTRIBUTE_UNUSED) { const char * errmsg; enum cgen_parse_operand_result result_type; @@ -320,7 +320,7 @@ parse_branch_addr (CGEN_CPU_DESC cd, char buf[20]; const char * bufp = (const char *) buf; - sprintf (buf, ".+%ld", value); + sprintf (buf, ".+%ld", (long) value); errmsg = cgen_parse_address (cd, &bufp, opindex, code, &result_type, &value); } diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index cac099e..68239dd 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -2,6 +2,8 @@ * disassemble.c (ARCH_epiphany): Move into alphasorted spot. + * epiphany-asm.c, epiphany-opc.h: Regenerate. + 2011-10-25 Joern Rennecke <joern.rennecke@embecosm.com> * Makefile.am (HFILES): Add epiphany-desc.h and epiphany-opc.h . diff --git a/opcodes/epiphany-asm.c b/opcodes/epiphany-asm.c index 31ceb3e..4eb7e54 100644 --- a/opcodes/epiphany-asm.c +++ b/opcodes/epiphany-asm.c @@ -133,7 +133,7 @@ static const char * parse_postindex (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED, const char ** strp, int opindex ATTRIBUTE_UNUSED, - bfd_vma * valuep) + unsigned long *valuep) { if (**strp == '#') ++*strp; /* Skip leading hashes. */ @@ -249,7 +249,7 @@ parse_branch_addr (CGEN_CPU_DESC cd, int opindex, int opinfo ATTRIBUTE_UNUSED, enum cgen_parse_operand_result * resultp ATTRIBUTE_UNUSED, - unsigned long * valuep ATTRIBUTE_UNUSED) + bfd_vma *valuep ATTRIBUTE_UNUSED) { const char * errmsg; enum cgen_parse_operand_result result_type; @@ -281,7 +281,7 @@ parse_branch_addr (CGEN_CPU_DESC cd, char buf[20]; const char * bufp = (const char *) buf; - sprintf (buf, ".+%ld", value); + sprintf (buf, ".+%ld", (long) value); errmsg = cgen_parse_address (cd, &bufp, opindex, code, &result_type, &value); } diff --git a/opcodes/epiphany-opc.h b/opcodes/epiphany-opc.h index d3f9348..d5d76d8 100644 --- a/opcodes/epiphany-opc.h +++ b/opcodes/epiphany-opc.h @@ -73,7 +73,7 @@ extern const char * parse_branch_addr (CGEN_CPU_DESC cd, int opindex, int opinfo, enum cgen_parse_operand_result * resultp, - unsigned long * valuep); + bfd_vma *valuep); /* Allows reason codes to be output when assembler errors occur. */ #define CGEN_VERBOSE_ASSEMBLER_ERRORS |