aboutsummaryrefslogtreecommitdiff
path: root/opcodes/ip2k-asm.c
diff options
context:
space:
mode:
Diffstat (limited to 'opcodes/ip2k-asm.c')
-rw-r--r--opcodes/ip2k-asm.c198
1 files changed, 90 insertions, 108 deletions
diff --git a/opcodes/ip2k-asm.c b/opcodes/ip2k-asm.c
index a0204d0..c5a3187 100644
--- a/opcodes/ip2k-asm.c
+++ b/opcodes/ip2k-asm.c
@@ -50,13 +50,15 @@ static const char * parse_insn_normal
/* -- asm.c */
#define PARSE_FUNC_DECL(name) \
-static const char *name PARAMS ((CGEN_CPU_DESC, const char **, int, long *))
+ static const char *name (CGEN_CPU_DESC, const char **, int, long *)
+#define PARSE_UFUNC_DECL(name) \
+ static const char *name (CGEN_CPU_DESC, const char **, int, unsigned long *)
-PARSE_FUNC_DECL (parse_fr);
-PARSE_FUNC_DECL (parse_addr16);
-PARSE_FUNC_DECL (parse_addr16_cjp);
+PARSE_UFUNC_DECL (parse_fr);
+PARSE_UFUNC_DECL (parse_addr16);
+PARSE_UFUNC_DECL (parse_addr16_cjp);
PARSE_FUNC_DECL (parse_lit8);
-PARSE_FUNC_DECL (parse_bit3);
+PARSE_UFUNC_DECL (parse_bit3);
static const char *
@@ -64,7 +66,7 @@ parse_fr (cd, strp, opindex, valuep)
CGEN_CPU_DESC cd;
const char **strp;
int opindex;
- long *valuep;
+ unsigned long *valuep;
{
const char *errmsg;
const char *old_strp;
@@ -77,47 +79,41 @@ parse_fr (cd, strp, opindex, valuep)
old_strp = *strp;
afteroffset = NULL;
-
- /* Check here to see if you're about to try parsing a w as the first arg */
- /* and return an error if you are. */
- if ( (strncmp(*strp,"w",1)==0) || (strncmp(*strp,"W",1)==0) )
+ /* Check here to see if you're about to try parsing a w as the first arg
+ and return an error if you are. */
+ if ((strncmp (*strp, "w", 1) == 0) || (strncmp (*strp, "W", 1) == 0))
{
(*strp)++;
- if ( (strncmp(*strp,",",1)==0) || ISSPACE(**strp) )
+ if ((strncmp (*strp, ",", 1) == 0) || ISSPACE (**strp))
{
- /* We've been passed a w. Return with an error message so that */
- /* cgen will try the next parsing option. */
+ /* We've been passed a w. Return with an error message so that
+ cgen will try the next parsing option. */
errmsg = _("W keyword invalid in FR operand slot.");
return errmsg;
}
*strp = old_strp;
}
-
/* Attempt parse as register keyword. */
- /* old_strp = *strp; */
-
errmsg = cgen_parse_keyword (cd, strp, & ip2k_cgen_opval_register_names,
- valuep);
- if ( *strp != NULL )
- if (errmsg == NULL)
- return errmsg;
+ (long *) valuep);
+ if (*strp != NULL
+ && errmsg == NULL)
+ return errmsg;
- /* Attempt to parse for "(IP)" */
- afteroffset = strstr(*strp,"(IP)");
+ /* Attempt to parse for "(IP)". */
+ afteroffset = strstr (*strp, "(IP)");
- if ( afteroffset == NULL)
- {
- /* Make sure it's not in lower case */
- afteroffset = strstr(*strp,"(ip)");
- }
+ if (afteroffset == NULL)
+ /* Make sure it's not in lower case. */
+ afteroffset = strstr (*strp, "(ip)");
- if ( afteroffset != NULL )
+ if (afteroffset != NULL)
{
- if ( afteroffset != *strp )
+ if (afteroffset != *strp)
{
- /* Invalid offset present.*/
+ /* Invalid offset present. */
errmsg = _("offset(IP) is not a valid form");
return errmsg;
}
@@ -130,47 +126,42 @@ parse_fr (cd, strp, opindex, valuep)
}
}
- /* Attempt to parse for DP. ex: mov w, offset(DP) */
- /* mov offset(DP),w */
-
- /* Try parsing it as an address and see what comes back */
+ /* Attempt to parse for DP. ex: mov w, offset(DP)
+ mov offset(DP),w */
- afteroffset = strstr(*strp,"(DP)");
+ /* Try parsing it as an address and see what comes back. */
+ afteroffset = strstr (*strp, "(DP)");
- if ( afteroffset == NULL)
- {
- /* Maybe it's in lower case */
- afteroffset = strstr(*strp,"(dp)");
- }
+ if (afteroffset == NULL)
+ /* Maybe it's in lower case. */
+ afteroffset = strstr (*strp, "(dp)");
- if ( afteroffset != NULL )
+ if (afteroffset != NULL)
{
- if ( afteroffset == *strp )
+ if (afteroffset == *strp)
{
- /* No offset present. Use 0 by default. */
+ /* No offset present. Use 0 by default. */
tempvalue = 0;
errmsg = NULL;
}
else
- {
- errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_IP2K_FR_OFFSET,
- & result_type, & tempvalue);
- }
+ errmsg = cgen_parse_address (cd, strp, opindex,
+ BFD_RELOC_IP2K_FR_OFFSET,
+ & result_type, & tempvalue);
if (errmsg == NULL)
{
if (tempvalue <= 127)
{
- /* Value is ok. Fix up the first 2 bits and return */
+ /* Value is ok. Fix up the first 2 bits and return. */
*valuep = 0x0100 | tempvalue;
- *strp += 4; /* skip over the (DP) in *strp */
+ *strp += 4; /* skip over the (DP) in *strp. */
return errmsg;
}
else
{
/* Found something there in front of (DP) but it's out
- of range. */
+ of range. */
errmsg = _("(DP) offset out of range.");
return errmsg;
}
@@ -178,54 +169,47 @@ parse_fr (cd, strp, opindex, valuep)
}
- /* Attempt to parse for SP. ex: mov w, offset(SP) */
- /* mov offset(SP), w */
-
-
- afteroffset = strstr(*strp,"(SP)");
+ /* Attempt to parse for SP. ex: mov w, offset(SP)
+ mov offset(SP), w. */
+ afteroffset = strstr (*strp, "(SP)");
if (afteroffset == NULL)
- {
- /* Maybe it's in lower case. */
- afteroffset = strstr(*strp, "(sp)");
- }
+ /* Maybe it's in lower case. */
+ afteroffset = strstr (*strp, "(sp)");
- if ( afteroffset != NULL )
+ if (afteroffset != NULL)
{
- if ( afteroffset == *strp )
+ if (afteroffset == *strp)
{
- /* No offset present. Use 0 by default. */
+ /* No offset present. Use 0 by default. */
tempvalue = 0;
errmsg = NULL;
}
else
- {
- errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_IP2K_FR_OFFSET,
- & result_type, & tempvalue);
- }
+ errmsg = cgen_parse_address (cd, strp, opindex,
+ BFD_RELOC_IP2K_FR_OFFSET,
+ & result_type, & tempvalue);
+
if (errmsg == NULL)
{
if (tempvalue <= 127)
{
- /* Value is ok. Fix up the first 2 bits and return */
+ /* Value is ok. Fix up the first 2 bits and return. */
*valuep = 0x0180 | tempvalue;
- *strp += 4; /* skip over the (SP) in *strp */
+ *strp += 4; /* skip over the (SP) in *strp. */
return errmsg;
}
else
{
/* Found something there in front of (SP) but it's out
- of range. */
+ of range. */
errmsg = _("(SP) offset out of range.");
return errmsg;
}
-
}
}
-
- /* Attempt to parse as an address. */
+ /* Attempt to parse as an address. */
*strp = old_strp;
errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_IP2K_FR9,
& result_type, & value);
@@ -233,14 +217,12 @@ parse_fr (cd, strp, opindex, valuep)
{
*valuep = value;
- /* if a parenthesis is found, warn about invalid form */
-
+ /* if a parenthesis is found, warn about invalid form. */
if (**strp == '(')
- {
- errmsg = _("illegal use of parentheses");
- }
+ errmsg = _("illegal use of parentheses");
+
/* if a numeric value is specified, ensure that it is between
- 1 and 255 */
+ 1 and 255. */
else if (result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
{
if (value < 0x1 || value > 0xff)
@@ -255,16 +237,16 @@ parse_addr16 (cd, strp, opindex, valuep)
CGEN_CPU_DESC cd;
const char **strp;
int opindex;
- long *valuep;
+ unsigned long *valuep;
{
const char *errmsg;
enum cgen_parse_operand_result result_type;
bfd_reloc_code_real_type code = BFD_RELOC_NONE;
bfd_vma value;
- if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16H )
+ if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16H)
code = BFD_RELOC_IP2K_HI8DATA;
- else if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16L )
+ else if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16L)
code = BFD_RELOC_IP2K_LO8DATA;
else
{
@@ -278,10 +260,10 @@ parse_addr16 (cd, strp, opindex, valuep)
if (errmsg == NULL)
{
/* We either have a relocation or a number now. */
- if ( result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER )
+ if (result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
{
/* We got a number back. */
- if ( code == BFD_RELOC_IP2K_HI8DATA )
+ if (code == BFD_RELOC_IP2K_HI8DATA)
value >>= 8;
else /* code = BFD_RELOC_IP2K_LOW8DATA */
value &= 0x00FF;
@@ -298,35 +280,35 @@ parse_addr16_cjp (cd, strp, opindex, valuep)
CGEN_CPU_DESC cd;
const char **strp;
int opindex;
- long *valuep;
+ unsigned long *valuep;
{
const char *errmsg;
enum cgen_parse_operand_result result_type;
bfd_reloc_code_real_type code = BFD_RELOC_NONE;
bfd_vma value;
- if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16CJP )
+ if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16CJP)
code = BFD_RELOC_IP2K_ADDR16CJP;
- else if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16P )
+ else if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16P)
code = BFD_RELOC_IP2K_PAGE3;
errmsg = cgen_parse_address (cd, strp, opindex, code,
& result_type, & value);
if (errmsg == NULL)
{
- if ( result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER )
+ if (result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
{
- if ( (value & 0x1) == 0) /* If the address is even .... */
+ if ((value & 0x1) == 0) /* If the address is even .... */
{
- if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16CJP )
+ if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16CJP)
*valuep = (value >> 1) & 0x1FFF; /* Should mask be 1FFF? */
- else if ( opindex == (CGEN_OPERAND_TYPE)IP2K_OPERAND_ADDR16P )
+ else if (opindex == (CGEN_OPERAND_TYPE) IP2K_OPERAND_ADDR16P)
*valuep = (value >> 14) & 0x7;
}
else
errmsg = _("Byte address required. - must be even.");
}
- else if ( result_type == CGEN_PARSE_OPERAND_RESULT_QUEUED )
+ else if (result_type == CGEN_PARSE_OPERAND_RESULT_QUEUED)
{
/* This will happen for things like (s2-s1) where s2 and s1
are labels. */
@@ -413,7 +395,7 @@ parse_bit3 (cd, strp, opindex, valuep)
CGEN_CPU_DESC cd;
const char **strp;
int opindex;
- long *valuep;
+ unsigned long *valuep;
{
const char *errmsg;
char mode = 0;
@@ -436,13 +418,13 @@ parse_bit3 (cd, strp, opindex, valuep)
mode = 2;
}
- errmsg = cgen_parse_signed_integer (cd, strp, opindex, valuep);
+ errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, valuep);
if (errmsg)
return errmsg;
if (mode)
{
- value = (unsigned long) *valuep;
+ value = * valuep;
if (value == 0)
{
errmsg = _("Attempt to find bit index of 0");
@@ -507,40 +489,40 @@ ip2k_cgen_parse_operand (cd, opindex, strp, fields)
switch (opindex)
{
case IP2K_OPERAND_ADDR16CJP :
- errmsg = parse_addr16_cjp (cd, strp, IP2K_OPERAND_ADDR16CJP, &fields->f_addr16cjp);
+ errmsg = parse_addr16_cjp (cd, strp, IP2K_OPERAND_ADDR16CJP, (unsigned long *) (& fields->f_addr16cjp));
break;
case IP2K_OPERAND_ADDR16H :
- errmsg = parse_addr16 (cd, strp, IP2K_OPERAND_ADDR16H, &fields->f_imm8);
+ errmsg = parse_addr16 (cd, strp, IP2K_OPERAND_ADDR16H, (unsigned long *) (& fields->f_imm8));
break;
case IP2K_OPERAND_ADDR16L :
- errmsg = parse_addr16 (cd, strp, IP2K_OPERAND_ADDR16L, &fields->f_imm8);
+ errmsg = parse_addr16 (cd, strp, IP2K_OPERAND_ADDR16L, (unsigned long *) (& fields->f_imm8));
break;
case IP2K_OPERAND_ADDR16P :
- errmsg = parse_addr16_cjp (cd, strp, IP2K_OPERAND_ADDR16P, &fields->f_page3);
+ errmsg = parse_addr16_cjp (cd, strp, IP2K_OPERAND_ADDR16P, (unsigned long *) (& fields->f_page3));
break;
case IP2K_OPERAND_BITNO :
- errmsg = parse_bit3 (cd, strp, IP2K_OPERAND_BITNO, &fields->f_bitno);
+ errmsg = parse_bit3 (cd, strp, IP2K_OPERAND_BITNO, (unsigned long *) (& fields->f_bitno));
break;
case IP2K_OPERAND_CBIT :
- errmsg = cgen_parse_unsigned_integer (cd, strp, IP2K_OPERAND_CBIT, &junk);
+ errmsg = cgen_parse_unsigned_integer (cd, strp, IP2K_OPERAND_CBIT, (unsigned long *) (& junk));
break;
case IP2K_OPERAND_DCBIT :
- errmsg = cgen_parse_unsigned_integer (cd, strp, IP2K_OPERAND_DCBIT, &junk);
+ errmsg = cgen_parse_unsigned_integer (cd, strp, IP2K_OPERAND_DCBIT, (unsigned long *) (& junk));
break;
case IP2K_OPERAND_FR :
- errmsg = parse_fr (cd, strp, IP2K_OPERAND_FR, &fields->f_reg);
+ errmsg = parse_fr (cd, strp, IP2K_OPERAND_FR, (unsigned long *) (& fields->f_reg));
break;
case IP2K_OPERAND_LIT8 :
- errmsg = parse_lit8 (cd, strp, IP2K_OPERAND_LIT8, &fields->f_imm8);
+ errmsg = parse_lit8 (cd, strp, IP2K_OPERAND_LIT8, (long *) (& fields->f_imm8));
break;
case IP2K_OPERAND_PABITS :
- errmsg = cgen_parse_unsigned_integer (cd, strp, IP2K_OPERAND_PABITS, &junk);
+ errmsg = cgen_parse_unsigned_integer (cd, strp, IP2K_OPERAND_PABITS, (unsigned long *) (& junk));
break;
case IP2K_OPERAND_RETI3 :
- errmsg = cgen_parse_unsigned_integer (cd, strp, IP2K_OPERAND_RETI3, &fields->f_reti3);
+ errmsg = cgen_parse_unsigned_integer (cd, strp, IP2K_OPERAND_RETI3, (unsigned long *) (& fields->f_reti3));
break;
case IP2K_OPERAND_ZBIT :
- errmsg = cgen_parse_unsigned_integer (cd, strp, IP2K_OPERAND_ZBIT, &junk);
+ errmsg = cgen_parse_unsigned_integer (cd, strp, IP2K_OPERAND_ZBIT, (unsigned long *) (& junk));
break;
default :
generated by cgit v1.1 at 2024-11-27 23:00:54 +0000