aboutsummaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
Diffstat (limited to 'cpu')
-rw-r--r--cpu/ChangeLog4
-rw-r--r--cpu/or1k.opc174
2 files changed, 91 insertions, 87 deletions
diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index afe23a8..7f78a26 100644
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-12 Alan Modra <amodra@gmail.com>
+
+ * or1k.opc: Whitespace fixes.
+
2014-05-08 Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
* or1korbis.cpu (h-atomic-reserve): New hardware.
diff --git a/cpu/or1k.opc b/cpu/or1k.opc
index 5d974e1..98b7532 100644
--- a/cpu/or1k.opc
+++ b/cpu/or1k.opc
@@ -53,11 +53,11 @@ static const char * MISSING_CLOSING_PARENTHESIS = N_("missing `)'");
static const char *
parse_disp26 (CGEN_CPU_DESC cd,
- const char ** strp,
- int opindex,
- int opinfo,
- enum cgen_parse_operand_result * resultp,
- bfd_vma * valuep)
+ const char ** strp,
+ int opindex,
+ int opinfo,
+ enum cgen_parse_operand_result * resultp,
+ bfd_vma * valuep)
{
const char *errmsg = NULL;
enum cgen_parse_operand_result result_type;
@@ -68,13 +68,13 @@ parse_disp26 (CGEN_CPU_DESC cd,
*strp += 4;
errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_OR1K_PLT26,
- & result_type, & value);
+ & result_type, & value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value = (value >> 2) & 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value = (value >> 2) & 0xffff;
*valuep = value;
return errmsg;
}
@@ -97,9 +97,9 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 3;
errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_HI16,
- & result_type, & value);
+ & result_type, & value);
if (**strp != ')')
- errmsg = MISSING_CLOSING_PARENTHESIS;
+ errmsg = MISSING_CLOSING_PARENTHESIS;
++*strp;
ret = value;
@@ -118,9 +118,9 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 3;
errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_LO16,
- & result_type, & value);
+ & result_type, & value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
ret = value;
@@ -137,13 +137,13 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 4;
errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_OR1K_GOT16,
- & result_type, & value);
+ & result_type, & value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value &= 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value &= 0xffff;
*valuep = value;
return errmsg;
}
@@ -153,14 +153,14 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 8;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_GOTPC_HI16,
- & result_type, & value);
+ BFD_RELOC_OR1K_GOTPC_HI16,
+ & result_type, & value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value = (value >> 16) & 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value = (value >> 16) & 0xffff;
*valuep = value;
return errmsg;
}
@@ -170,14 +170,14 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 8;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_GOTPC_LO16,
- &result_type, &value);
+ BFD_RELOC_OR1K_GOTPC_LO16,
+ &result_type, &value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value &= 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value &= 0xffff;
*valuep = value;
return errmsg;
}
@@ -187,15 +187,15 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 9;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_GOTOFF_HI16,
- & result_type, & value);
+ BFD_RELOC_OR1K_GOTOFF_HI16,
+ & result_type, & value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value = (value >> 16) & 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value = (value >> 16) & 0xffff;
*valuep = value;
return errmsg;
}
@@ -205,14 +205,14 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 9;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_GOTOFF_LO16,
- &result_type, &value);
+ BFD_RELOC_OR1K_GOTOFF_LO16,
+ &result_type, &value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value &= 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value &= 0xffff;
*valuep = value;
return errmsg;
}
@@ -222,15 +222,15 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 8;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_TLS_GD_HI16,
- & result_type, & value);
+ BFD_RELOC_OR1K_TLS_GD_HI16,
+ & result_type, & value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value = (value >> 16) & 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value = (value >> 16) & 0xffff;
*valuep = value;
return errmsg;
}
@@ -240,14 +240,14 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 8;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_TLS_GD_LO16,
- &result_type, &value);
+ BFD_RELOC_OR1K_TLS_GD_LO16,
+ &result_type, &value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value &= 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value &= 0xffff;
*valuep = value;
return errmsg;
}
@@ -257,15 +257,15 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 9;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_TLS_LDM_HI16,
- & result_type, & value);
+ BFD_RELOC_OR1K_TLS_LDM_HI16,
+ & result_type, & value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value = (value >> 16) & 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value = (value >> 16) & 0xffff;
*valuep = value;
return errmsg;
}
@@ -275,14 +275,14 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 9;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_TLS_LDM_LO16,
- &result_type, &value);
+ BFD_RELOC_OR1K_TLS_LDM_LO16,
+ &result_type, &value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value &= 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value &= 0xffff;
*valuep = value;
return errmsg;
}
@@ -292,15 +292,15 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 9;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_TLS_LDO_HI16,
- & result_type, & value);
+ BFD_RELOC_OR1K_TLS_LDO_HI16,
+ & result_type, & value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value = (value >> 16) & 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value = (value >> 16) & 0xffff;
*valuep = value;
return errmsg;
}
@@ -310,14 +310,14 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 9;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_TLS_LDO_LO16,
- &result_type, &value);
+ BFD_RELOC_OR1K_TLS_LDO_LO16,
+ &result_type, &value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value &= 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value &= 0xffff;
*valuep = value;
return errmsg;
}
@@ -327,15 +327,15 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 11;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_TLS_IE_HI16,
- & result_type, & value);
+ BFD_RELOC_OR1K_TLS_IE_HI16,
+ & result_type, & value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value = (value >> 16) & 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value = (value >> 16) & 0xffff;
*valuep = value;
return errmsg;
}
@@ -345,14 +345,14 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 11;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_TLS_IE_LO16,
- &result_type, &value);
+ BFD_RELOC_OR1K_TLS_IE_LO16,
+ &result_type, &value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value &= 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value &= 0xffff;
*valuep = value;
return errmsg;
}
@@ -362,15 +362,15 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 8;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_TLS_LE_HI16,
- & result_type, & value);
+ BFD_RELOC_OR1K_TLS_LE_HI16,
+ & result_type, & value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value = (value >> 16) & 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value = (value >> 16) & 0xffff;
*valuep = value;
return errmsg;
}
@@ -380,14 +380,14 @@ parse_simm16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
*strp += 8;
errmsg = cgen_parse_address (cd, strp, opindex,
- BFD_RELOC_OR1K_TLS_LE_LO16,
- &result_type, &value);
+ BFD_RELOC_OR1K_TLS_LE_LO16,
+ &result_type, &value);
if (**strp != ')')
- return MISSING_CLOSING_PARENTHESIS;
+ return MISSING_CLOSING_PARENTHESIS;
++*strp;
if (errmsg == NULL
- && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
- value &= 0xffff;
+ && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+ value &= 0xffff;
*valuep = value;
return errmsg;
}