X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-z8k.c;h=a0986e211831526c8b4a25dbd580cbc56c1481ac;hb=f5040a92c5b78b41f33dc3488dc1820bc5f916a8;hp=44eaeeb0ffcbce0e6abaae43b4469843a3ccd6e3;hpb=7e8892c38227fd2677e0a118d109694a4fc17436;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c index 44eaeeb0ff..a0986e2118 100644 --- a/gas/config/tc-z8k.c +++ b/gas/config/tc-z8k.c @@ -1,5 +1,6 @@ -/* tc-z8k.c -- Assemble code for the Zilog Z800N - Copyright (C) 1992 Free Software Foundation. +/* tc-z8k.c -- Assemble code for the Zilog Z800n + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2002 + Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -14,208 +15,240 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ + along with GAS; see the file COPYING. If not, write to the Free + Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ -/* - Written By Steve Chamberlain - sac@cygnus.com - */ +/* Written By Steve Chamberlain . */ -#include #define DEFINE_TABLE -#include "../opcodes/z8k-opc.h" +#include #include "as.h" -#include "read.h" #include "bfd.h" -#include -#include "listing.h" +#include "safe-ctype.h" +#include "opcodes/z8k-opc.h" -const char comment_chars[] = -{'!', 0}; -const char line_separator_chars[] = -{';', 0}; -const char line_comment_chars[] = { '#', 0}; +const char comment_chars[] = "!"; +const char line_comment_chars[] = "#"; +const char line_separator_chars[] = ";"; extern int machine; extern int coff_flags; int segmented_mode; -int md_reloc_size; - -/* This table describes all the machine specific pseudo-ops the assembler - has to support. The fields are: - pseudo-op name without dot - function to call to execute this pseudo-op - Integer arg to pass to the function - */ +const int md_reloc_size; -void cons (); +static void s_segm PARAMS ((int)); +static void s_unseg PARAMS ((int)); +static void even PARAMS ((int)); +static int tohex PARAMS ((int)); +static void sval PARAMS ((int)); -void -s_segm () +static void +s_segm (ignore) + int ignore ATTRIBUTE_UNUSED; { segmented_mode = 1; machine = bfd_mach_z8001; coff_flags = F_Z8001; } -void -s_unseg () +static void +s_unseg (ignore) + int ignore ATTRIBUTE_UNUSED; { segmented_mode = 0; machine = bfd_mach_z8002; coff_flags = F_Z8002; } -static -void even() +static void +even (ignore) + int ignore ATTRIBUTE_UNUSED; { - frag_align (1, 0); - record_alignment(now_seg,1); + frag_align (1, 0, 0); + record_alignment (now_seg, 1); } -void obj_coff_section(); -int tohex(c) -int c; +static int +tohex (c) + int c; { -if (isdigit(c)) return c - '0'; -if (islower(c)) return c - 'a' + 10; -return c - 'A' + 10; + if (ISDIGIT (c)) + return c - '0'; + if (ISLOWER (c)) + return c - 'a' + 10; + return c - 'A' + 10; } -void sval() -{ - SKIP_WHITESPACE(); - if (*input_line_pointer == '\'') { - int c; - input_line_pointer++; - c = *input_line_pointer++; - while (c != '\'') { - if (c== '%') { - c = (tohex(input_line_pointer[0]) << 4) - | tohex(input_line_pointer[1]); - input_line_pointer+=2; - } - FRAG_APPEND_1_CHAR(c); +static void +sval (ignore) + int ignore ATTRIBUTE_UNUSED; +{ + SKIP_WHITESPACE (); + if (*input_line_pointer == '\'') + { + int c; + input_line_pointer++; c = *input_line_pointer++; + while (c != '\'') + { + if (c == '%') + { + c = (tohex (input_line_pointer[0]) << 4) + | tohex (input_line_pointer[1]); + input_line_pointer += 2; + } + FRAG_APPEND_1_CHAR (c); + c = *input_line_pointer++; + } + demand_empty_rest_of_line (); } - demand_empty_rest_of_line(); - } - } -const pseudo_typeS md_pseudo_table[] = -{ - {"int", cons, 2}, - {"data.b", cons, 1}, - {"data.w", cons, 2}, - {"data.l", cons, 4}, - {"form", listing_psize, 0}, - {"heading", listing_title, 0}, - {"import", s_ignore, 0}, - {"page", listing_eject, 0}, - {"program", s_ignore, 0}, - {"z8001", s_segm, 0}, - {"z8002", s_unseg, 0}, - - - {"segm", s_segm, 0}, - {"unsegm", s_unseg, 0}, - {"name", s_app_file, 0}, - {"global",s_globl,0}, - {"wval",cons,2}, - {"lval",cons,4}, - {"bval",cons,1}, - {"sval",sval,0}, - {"rsect",obj_coff_section,0}, - {"sect",obj_coff_section,0}, - {"block",s_space,0}, - {"even",even,0}, - {0, 0, 0} + +/* This table describes all the machine specific pseudo-ops the assembler + has to support. The fields are: + pseudo-op name without dot + function to call to execute this pseudo-op + Integer arg to pass to the function + */ + +const pseudo_typeS md_pseudo_table[] = { + {"int" , cons , 2}, + {"data.b" , cons , 1}, + {"data.w" , cons , 2}, + {"data.l" , cons , 4}, + {"form" , listing_psize , 0}, + {"heading", listing_title , 0}, + {"import" , s_ignore , 0}, + {"page" , listing_eject , 0}, + {"program", s_ignore , 0}, + {"z8001" , s_segm , 0}, + {"z8002" , s_unseg , 0}, + + {"segm" , s_segm , 0}, + {"unsegm" , s_unseg , 0}, + {"unseg" , s_unseg , 0}, + {"name" , s_app_file , 0}, + {"global" , s_globl , 0}, + {"wval" , cons , 2}, + {"lval" , cons , 4}, + {"bval" , cons , 1}, + {"sval" , sval , 0}, + {"rsect" , obj_coff_section, 0}, + {"sect" , obj_coff_section, 0}, + {"block" , s_space , 0}, + {"even" , even , 0}, + {0 , 0 , 0} }; const char EXP_CHARS[] = "eE"; -/* Chars that mean this number is a floating point constant */ -/* As in 0f12.456 */ -/* or 0d1.2345e12 */ +/* Chars that mean this number is a floating point constant. + As in 0f12.456 + or 0d1.2345e12 */ const char FLT_CHARS[] = "rRsSfFdDxXpP"; -const relax_typeS md_relax_table[1]; - -static struct hash_control *opcode_hash_control; /* Opcode mnemonics */ +/* Opcode mnemonics. */ +static struct hash_control *opcode_hash_control; void md_begin () { - opcode_entry_type *opcode; - char *prev_name = ""; - int idx = 0; + const opcode_entry_type *opcode; + int idx = -1; opcode_hash_control = hash_new (); for (opcode = z8k_table; opcode->name; opcode++) { - /* Only enter unique codes into the table */ - char *src = opcode->name; - - if (strcmp (opcode->name, prev_name)) - { - hash_insert (opcode_hash_control, opcode->name, (char *) opcode); - idx++; - } - opcode->idx = idx; - prev_name = opcode->name; + /* Only enter unique codes into the table. */ + if (idx != opcode->idx) + hash_insert (opcode_hash_control, opcode->name, (char *) opcode); + idx = opcode->idx; } - /* default to z8002 */ - s_unseg (); + /* Default to z8002. */ + s_unseg (0); - /* insert the pseudo ops too */ - for (idx = 0; md_pseudo_table[idx].poc_name; idx++) - { - opcode_entry_type *fake_opcode; - fake_opcode = (opcode_entry_type*)malloc(sizeof(opcode_entry_type)); - fake_opcode->name = md_pseudo_table[idx].poc_name, - fake_opcode->func = (void *)(md_pseudo_table+idx); - fake_opcode->opcode = 250; - - hash_insert(opcode_hash_control,fake_opcode->name,fake_opcode); - - } + /* Insert the pseudo ops, too. */ + for (idx = 0; md_pseudo_table[idx].poc_name; idx++) + { + opcode_entry_type *fake_opcode; + fake_opcode = (opcode_entry_type *) malloc (sizeof (opcode_entry_type)); + fake_opcode->name = md_pseudo_table[idx].poc_name; + fake_opcode->func = (void *) (md_pseudo_table + idx); + fake_opcode->opcode = 250; + hash_insert (opcode_hash_control, fake_opcode->name, fake_opcode); + } + + linkrelax = 1; } -struct z8k_exp -{ +struct z8k_exp { char *e_beg; char *e_end; expressionS e_exp; }; -typedef struct z8k_op -{ - char regsize; /* 'b','w','r','q' */ - unsigned int reg; /* 0..15 */ + +typedef struct z8k_op { + /* 'b','w','r','q'. */ + char regsize; + + /* 0 .. 15. */ + unsigned int reg; int mode; - unsigned int x_reg; /* any other register associated with the mode */ - expressionS exp; /* any expression */ -} + /* Any other register associated with the mode. */ + unsigned int x_reg; -op_type; + /* Any expression. */ + expressionS exp; +} op_type; static expressionS *da_operand; static expressionS *imm_operand; int reg[16]; int the_cc; +int the_ctrl; +int the_flags; +int the_interrupt; + +static char *whatreg PARAMS ((int *, char *)); +static char *parse_reg PARAMS ((char *, int *, unsigned int *)); +static char *parse_exp PARAMS ((char *, expressionS *)); +static char *checkfor PARAMS ((char *, char)); +static void regword PARAMS ((int, char *)); +static void regaddr PARAMS ((int, char *)); +static void get_ctrl_operand + PARAMS ((char **, struct z8k_op *, unsigned int)); +static void get_flags_operand + PARAMS ((char **, struct z8k_op *, unsigned int)); +static void get_interrupt_operand + PARAMS ((char **, struct z8k_op *, unsigned int)); +static void get_cc_operand + PARAMS ((char **, struct z8k_op *, unsigned int)); +static void get_operand + PARAMS ((char **, struct z8k_op *, unsigned int)); +static char *get_operands + PARAMS ((const opcode_entry_type *, char *, op_type *)); +static opcode_entry_type *get_specific + PARAMS ((opcode_entry_type *, op_type *)); +static void newfix + PARAMS ((int, int, expressionS *)); +static char *apply_fix + PARAMS ((char *, int, expressionS *, int)); +static void build_bytes + PARAMS ((opcode_entry_type *, struct z8k_op *)); -char * -DEFUN (whatreg, (reg, src), - int *reg AND - char *src) +static char * +whatreg (reg, src) + int *reg; + char *src; { - if (isdigit (src[1])) + if (ISDIGIT (src[1])) { *reg = (src[0] - '0') * 10 + src[1] - '0'; return src + 2; @@ -227,106 +260,118 @@ DEFUN (whatreg, (reg, src), } } -/* - parse operands +/* Parse operands - rh0-rh7, rl0-rl7 - r0-r15 - rr0-rr14 - rq0--rq12 - WREG r0,r1,r2,r3,r4,r5,r6,r7,fp,sp - r0l,r0h,..r7l,r7h - @WREG - @WREG+ - @-WREG - #const + rh0-rh7, rl0-rl7 + r0-r15 + rr0-rr14 + rq0--rq12 + WREG r0,r1,r2,r3,r4,r5,r6,r7,fp,sp + r0l,r0h,..r7l,r7h + @WREG + @WREG+ + @-WREG + #const +*/ - */ +/* Try to parse a reg name. Return a pointer to the first character + in SRC after the reg name. */ -/* try and parse a reg name, returns number of chars consumed */ -char * -DEFUN (parse_reg, (src, mode, reg), - char *src AND - int *mode AND - unsigned int *reg) +static char * +parse_reg (src, mode, reg) + char *src; + int *mode; + unsigned int *reg; { char *res = 0; + char regno; - if (src[0] == 's' && src[1]=='p') { - if (segmented_mode) { - *mode = CLASS_REG_LONG; - *reg = 14; - } - else + if (src[0] == 's' && src[1] == 'p' && (src[2] == 0 || src[2] == ',')) { - *mode = CLASS_REG_WORD; - *reg = 15; + if (segmented_mode) + { + *mode = CLASS_REG_LONG; + *reg = 14; + } + else + { + *mode = CLASS_REG_WORD; + *reg = 15; + } + return src + 2; } - return src+2; - } if (src[0] == 'r') - { - if (src[1] == 'r') - { - *mode = CLASS_REG_LONG; - res = whatreg (reg, src + 2); - } - else if (src[1] == 'h' ) { - *mode = CLASS_REG_BYTE; - res = whatreg (reg, src + 2) ; - } - else if (src[1] == 'l' ) - { - *mode = CLASS_REG_BYTE; - res = whatreg (reg, src + 2); - *reg += 8; - } - else if (src[1] == 'q') - { - *mode = CLASS_REG_QUAD; - res = whatreg (reg, src + 2); - } - else - { - *mode = CLASS_REG_WORD; - res = whatreg (reg, src + 1); + if (src[1] == 'r') + { + if (src[2] < '0' || src[2] > '9') + return res; /* Assume no register name but a label starting with 'rr'. */ + *mode = CLASS_REG_LONG; + res = whatreg (reg, src + 2); + regno = *reg; + if (regno > 14) + as_warn (_("register rr%d, out of range."), regno); + } + else if (src[1] == 'h') + { + if (src[2] < '0' || src[2] > '9') + return res; /* Assume no register name but a label starting with 'rh'. */ + *mode = CLASS_REG_BYTE; + res = whatreg (reg, src + 2); + regno = *reg; + if (regno > 7) + as_warn (_("register rh%d, out of range."), regno); + } + else if (src[1] == 'l') + { + if (src[2] < '0' || src[2] > '9') + return res; /* Assume no register name but a label starting with 'rl'. */ + *mode = CLASS_REG_BYTE; + res = whatreg (reg, src + 2); + regno = *reg; + if (regno > 7) + as_warn (_("register rl%d, out of range."), regno); + *reg += 8; + } + else if (src[1] == 'q') + { + if (src[2] < '0' || src[2] > '9') + return res; /* Assume no register name but a label starting with 'rq'. */ + *mode = CLASS_REG_QUAD; + res = whatreg (reg, src + 2); + regno = *reg; + if (regno > 12) + as_warn (_("register rq%d, out of range."), regno); + } + else + { + if (src[1] < '0' || src[1] > '9') + return res; /* Assume no register name but a label starting with 'r'. */ + *mode = CLASS_REG_WORD; + res = whatreg (reg, src + 1); + regno = *reg; + if (regno > 15) + as_warn (_("register r%d, out of range."), regno); + } } - } return res; - } -char * -DEFUN (parse_exp, (s, op), - char *s AND - expressionS * op) +static char * +parse_exp (s, op) + char *s; + expressionS *op; { char *save = input_line_pointer; char *new; - segT seg; input_line_pointer = s; - seg = expr (0, op); + expression (op); + if (op->X_op == O_absent) + as_bad (_("missing operand")); new = input_line_pointer; input_line_pointer = save; - if (SEG_NORMAL (seg)) - return new; - switch (seg) - { - case SEG_ABSOLUTE: - case SEG_UNKNOWN: - case SEG_DIFFERENCE: - case SEG_BIG: - case SEG_REGISTER: - return new; - case SEG_ABSENT: - as_bad ("Missing operand"); - return new; - default: - as_bad ("Don't understand operand of type %s", segment_name (seg)); - return new; - } + return new; } /* The many forms of operand: @@ -341,98 +386,239 @@ DEFUN (parse_exp, (s, op), exp(r) r(#exp) r(r) - - - */ -static -char * -DEFUN (checkfor, (ptr, what), - char *ptr AND - char what) +static char * +checkfor (ptr, what) + char *ptr; + char what; { if (*ptr == what) ptr++; else - { - as_bad ("expected %c", what); - } + as_bad (_("expected %c"), what); + return ptr; } -/* Make sure the mode supplied is the size of a word */ +/* Make sure the mode supplied is the size of a word. */ + static void -DEFUN (regword, (mode, string), - int mode AND - char *string) +regword (mode, string) + int mode; + char *string; { int ok; ok = CLASS_REG_WORD; if (ok != mode) { - as_bad ("register is wrong size for a word %s", string); + as_bad (_("register is wrong size for a word %s"), string); } } -/* Make sure the mode supplied is the size of an address */ +/* Make sure the mode supplied is the size of an address. */ + static void -DEFUN (regaddr, (mode, string), - int mode AND - char *string) +regaddr (mode, string) + int mode; + char *string; { int ok; ok = segmented_mode ? CLASS_REG_LONG : CLASS_REG_WORD; if (ok != mode) { - as_bad ("register is wrong size for address %s", string); + as_bad (_("register is wrong size for address %s"), string); } } -struct cc_names +struct ctrl_names { + int value; + char *name; +}; + +struct ctrl_names ctrl_table[] = { + { 0x2, "fcw" }, + { 0x3, "refresh" }, + { 0x4, "psapseg" }, + { 0x5, "psapoff" }, + { 0x5, "psap" }, + { 0x6, "nspseg" }, + { 0x7, "nspoff" }, + { 0x7, "nsp" }, + { 0 , 0 } +}; + +static void +get_ctrl_operand (ptr, mode, dst) + char **ptr; + struct z8k_op *mode; + unsigned int dst ATTRIBUTE_UNUSED; { + char *src = *ptr; + int i; + + while (*src == ' ') + src++; + + mode->mode = CLASS_CTRL; + for (i = 0; ctrl_table[i].name; i++) + { + int j; + + for (j = 0; ctrl_table[i].name[j]; j++) + { + if (ctrl_table[i].name[j] != src[j]) + goto fail; + } + the_ctrl = ctrl_table[i].value; + *ptr = src + j; + return; + fail: + ; + } + the_ctrl = 0; + return; +} + +struct flag_names { + int value; + char *name; + +}; + +struct flag_names flag_table[] = { + { 0x1, "p" }, + { 0x1, "v" }, + { 0x2, "s" }, + { 0x4, "z" }, + { 0x8, "c" }, + { 0x0, "+" }, + { 0, 0 } +}; + +static void +get_flags_operand (ptr, mode, dst) + char **ptr; + struct z8k_op *mode; + unsigned int dst ATTRIBUTE_UNUSED; +{ + char *src = *ptr; + int i; + int j; + + while (*src == ' ') + src++; + + mode->mode = CLASS_FLAGS; + the_flags = 0; + for (j = 0; j <= 9; j++) + { + if (!src[j]) + goto done; + for (i = 0; flag_table[i].name; i++) + { + if (flag_table[i].name[0] == src[j]) + { + the_flags = the_flags | flag_table[i].value; + goto match; + } + } + goto done; + match: + ; + } + done: + *ptr = src + j; + return; +} + +struct interrupt_names { int value; char *name; }; -struct cc_names table[] = +struct interrupt_names intr_table[] = { + { 0x1, "nvi" }, + { 0x2, "vi" }, + { 0x3, "both" }, + { 0x3, "all" }, + { 0, 0 } +}; + +static void +get_interrupt_operand (ptr, mode, dst) + char **ptr; + struct z8k_op *mode; + unsigned int dst ATTRIBUTE_UNUSED; { - 0x0, "f", - 0x1, "lt", - 0x2, "le", - 0x3, "ule", - 0x4, "ov", - 0x4, "pe", - 0x5, "mi", - 0x6, "eq", - 0x6, "z", - 0x7, "c", - 0x7, "ult", - 0x8, "t", - 0x9, "ge", - 0xa, "gt", - 0xb, "ugt", - 0xc, "nov", - 0xc, "po", - 0xd, "pl", - 0xe, "ne", - 0xe, "nz", - 0xf, "nc", - 0xf, "uge", - 0, 0 + char *src = *ptr; + int i; + + while (*src == ' ') + src++; + + mode->mode = CLASS_IMM; + for (i = 0; intr_table[i].name; i++) + { + int j; + + for (j = 0; intr_table[i].name[j]; j++) + { + if (intr_table[i].name[j] != src[j]) + goto fail; + } + the_interrupt = intr_table[i].value; + *ptr = src + j; + return; + fail: + ; + } + the_interrupt = 0x0; + return; +} + +struct cc_names { + int value; + char *name; + +}; + +struct cc_names table[] = { + { 0x0, "f" }, + { 0x1, "lt" }, + { 0x2, "le" }, + { 0x3, "ule" }, + { 0x4, "ov" }, + { 0x4, "pe" }, + { 0x5, "mi" }, + { 0x6, "eq" }, + { 0x6, "z" }, + { 0x7, "c" }, + { 0x7, "ult" }, + { 0x8, "t" }, + { 0x9, "ge" }, + { 0xa, "gt" }, + { 0xb, "ugt" }, + { 0xc, "nov" }, + { 0xc, "po" }, + { 0xd, "pl" }, + { 0xe, "ne" }, + { 0xe, "nz" }, + { 0xf, "nc" }, + { 0xf, "uge" }, + { 0 , 0 } }; static void -DEFUN (get_cc_operand, (ptr, mode, dst), - char **ptr AND - struct z8k_op *mode AND - unsigned int dst) +get_cc_operand (ptr, mode, dst) + char **ptr; + struct z8k_op *mode; + unsigned int dst ATTRIBUTE_UNUSED; { char *src = *ptr; - int r; int i; while (*src == ' ') @@ -451,23 +637,20 @@ DEFUN (get_cc_operand, (ptr, mode, dst), the_cc = table[i].value; *ptr = src + j; return; - fail:; + fail: + ; } the_cc = 0x8; - return; } static void -DEFUN (get_operand, (ptr, mode, dst), - char **ptr AND - struct z8k_op *mode AND - unsigned int dst) +get_operand (ptr, mode, dst) + char **ptr; + struct z8k_op *mode; + unsigned int dst ATTRIBUTE_UNUSED; { char *src = *ptr; char *end; - unsigned int num; - unsigned int len; - unsigned int size; mode->mode = 0; @@ -503,20 +686,18 @@ DEFUN (get_operand, (ptr, mode, dst), end = parse_reg (src, &nw, &nr); if (end) { - /* Got Ra(Rb) */ + /* Got Ra(Rb). */ src = end; if (*src != ')') - { - as_bad ("Missing ) in ra(rb)"); - } + as_bad (_("Missing ) in ra(rb)")); else - { - src++; - } + src++; regaddr (mode->mode, "ra(rb) ra"); +#if 0 regword (mode->mode, "ra(rb) rb"); +#endif mode->mode = CLASS_BX; mode->reg = regn; mode->x_reg = nr; @@ -524,7 +705,7 @@ DEFUN (get_operand, (ptr, mode, dst), } else { - /* Got Ra(disp) */ + /* Got Ra(disp). */ if (*src == '#') src++; src = parse_exp (src, &(mode->exp)); @@ -543,7 +724,7 @@ DEFUN (get_operand, (ptr, mode, dst), } else { - /* No initial reg */ + /* No initial reg. */ src = parse_exp (src, &(mode->exp)); if (*src == '(') { @@ -558,7 +739,7 @@ DEFUN (get_operand, (ptr, mode, dst), } else { - /* Just an address */ + /* Just an address. */ mode->mode = CLASS_DA; mode->reg = 0; mode->x_reg = 0; @@ -569,15 +750,16 @@ DEFUN (get_operand, (ptr, mode, dst), *ptr = src; } -static -char * -DEFUN (get_operands, (opcode, op_end, operand), - opcode_entry_type * opcode AND - char *op_end AND - op_type * operand) +static char * +get_operands (opcode, op_end, operand) + const opcode_entry_type *opcode; + char *op_end; + op_type *operand; { char *ptr = op_end; + char *savptr; + ptr++; switch (opcode->noperands) { case 0: @@ -586,39 +768,54 @@ DEFUN (get_operands, (opcode, op_end, operand), break; case 1: - ptr++; if (opcode->arg_info[0] == CLASS_CC) - { - get_cc_operand (&ptr, operand + 0, 0); - } + get_cc_operand (&ptr, operand + 0, 0); + + else if (opcode->arg_info[0] == CLASS_FLAGS) + get_flags_operand (&ptr, operand + 0, 0); + + else if (opcode->arg_info[0] == (CLASS_IMM + (ARG_IMM2))) + get_interrupt_operand (&ptr, operand + 0, 0); + else - { + get_operand (&ptr, operand + 0, 0); - get_operand (&ptr, operand + 0, 0); - } operand[1].mode = 0; break; case 2: - ptr++; + savptr = ptr; if (opcode->arg_info[0] == CLASS_CC) + get_cc_operand (&ptr, operand + 0, 0); + + else if (opcode->arg_info[0] == CLASS_CTRL) { - get_cc_operand (&ptr, operand + 0, 0); + get_ctrl_operand (&ptr, operand + 0, 0); + + if (the_ctrl == 0) + { + ptr = savptr; + get_operand (&ptr, operand + 0, 0); + + if (ptr == 0) + return NULL; + if (*ptr == ',') + ptr++; + get_ctrl_operand (&ptr, operand + 1, 1); + return ptr; + } } else - { + get_operand (&ptr, operand + 0, 0); - get_operand (&ptr, operand + 0, 0); - } - if(ptr == 0) - return; + if (ptr == 0) + return NULL; if (*ptr == ',') ptr++; get_operand (&ptr, operand + 1, 1); break; case 3: - ptr++; get_operand (&ptr, operand + 0, 0); if (*ptr == ',') ptr++; @@ -629,7 +826,6 @@ DEFUN (get_operands, (opcode, op_end, operand), break; case 4: - ptr++; get_operand (&ptr, operand + 0, 0); if (*ptr == ',') ptr++; @@ -641,6 +837,7 @@ DEFUN (get_operands, (opcode, op_end, operand), ptr++; get_cc_operand (&ptr, operand + 3, 3); break; + default: abort (); } @@ -649,23 +846,19 @@ DEFUN (get_operands, (opcode, op_end, operand), } /* Passed a pointer to a list of opcodes which use different - addressing modes, return the opcode which matches the opcodes - provided - */ - -static -opcode_entry_type * -DEFUN (get_specific, (opcode, operands), - opcode_entry_type * opcode AND - op_type * operands) + addressing modes. Return the opcode which matches the opcodes + provided. */ +static opcode_entry_type * +get_specific (opcode, operands) + opcode_entry_type *opcode; + op_type *operands; { opcode_entry_type *this_try = opcode; int found = 0; unsigned int noperands = opcode->noperands; - unsigned int dispreg; - unsigned int this_index = opcode->idx; + int this_index = opcode->idx; while (this_index == opcode->idx && !found) { @@ -674,24 +867,37 @@ DEFUN (get_specific, (opcode, operands), this_try = opcode++; for (i = 0; i < noperands; i++) { - int mode = operands[i].mode; + unsigned int mode = operands[i].mode; if ((mode & CLASS_MASK) != (this_try->arg_info[i] & CLASS_MASK)) { - /* it could be an pc rel operand, if this is a da mode and - we like disps, then insert it */ + /* It could be a pc rel operand, if this is a da mode + and we like disps, then insert it. */ if (mode == CLASS_DA && this_try->arg_info[i] == CLASS_DISP) { - /* This is the case */ + /* This is the case. */ operands[i].mode = CLASS_DISP; } else if (mode == CLASS_BA && this_try->arg_info[i]) { - /* Can't think of a way to turn what we've been given into - something that's ok */ + /* Can't think of a way to turn what we've been + given into something that's OK. */ goto fail; } + else if (this_try->arg_info[i] & CLASS_PR) + { + if (mode == CLASS_REG_LONG && segmented_mode) + { + /* OK. */ + } + else if (mode == CLASS_REG_WORD && !segmented_mode) + { + /* OK. */ + } + else + goto fail; + } else goto fail; } @@ -716,7 +922,8 @@ DEFUN (get_specific, (opcode, operands), } found = 1; - fail:; + fail: + ; } if (found) return this_try; @@ -724,71 +931,71 @@ DEFUN (get_specific, (opcode, operands), return 0; } +#if 0 /* Not used. */ static void -DEFUN (check_operand, (operand, width, string), - struct z8k_op *operand AND - unsigned int width AND - char *string) +check_operand (operand, width, string) + struct z8k_op *operand; + unsigned int width; + char *string; { if (operand->exp.X_add_symbol == 0 - && operand->exp.X_subtract_symbol == 0) + && operand->exp.X_op_symbol == 0) { - /* No symbol involved, let's look at offset, it's dangerous if any of - the high bits are not 0 or ff's, find out by oring or anding with - the width and seeing if the answer is 0 or all fs*/ + /* No symbol involved, let's look at offset, it's dangerous if + any of the high bits are not 0 or ff's, find out by oring or + anding with the width and seeing if the answer is 0 or all + fs. */ if ((operand->exp.X_add_number & ~width) != 0 && (operand->exp.X_add_number | width) != (~0)) { - as_warn ("operand %s0x%x out of range.", string, operand->exp.X_add_number); + as_warn (_("operand %s0x%x out of range."), + string, operand->exp.X_add_number); } } } +#endif static char buffer[20]; static void -DEFUN (newfix, (ptr, type, operand), - int ptr AND - int type AND - expressionS * operand) +newfix (ptr, type, operand) + int ptr; + int type; + expressionS *operand; { if (operand->X_add_symbol - || operand->X_subtract_symbol + || operand->X_op_symbol || operand->X_add_number) { - fix_new (frag_now, - ptr, - 1, - operand->X_add_symbol, - operand->X_subtract_symbol, - operand->X_add_number, - 0, - type); + fix_new_exp (frag_now, + ptr, + 1, + operand, + 0, + type); } } static char * -DEFUN (apply_fix, (ptr, type, operand, size), - char *ptr AND - int type AND - expressionS * operand AND - int size) +apply_fix (ptr, type, operand, size) + char *ptr; + int type; + expressionS *operand; + int size; { int n = operand->X_add_number; - operand->X_add_number = n; newfix ((ptr - buffer) / 2, type, operand); -#if 1 switch (size) { - case 8: /* 8 nibbles == 32 bits */ + case 8: /* 8 nibbles == 32 bits. */ *ptr++ = n >> 28; *ptr++ = n >> 24; *ptr++ = n >> 20; *ptr++ = n >> 16; - case 4: /* 4 niblles == 16 bits */ + case 4: /* 4 nibbles == 16 bits. */ *ptr++ = n >> 12; *ptr++ = n >> 8; case 2: @@ -797,51 +1004,43 @@ DEFUN (apply_fix, (ptr, type, operand, size), *ptr++ = n >> 0; break; } -#endif return ptr; - } -/* Now we know what sort of opcodes it is, lets build the bytes - - */ +/* Now we know what sort of opcodes it is. Let's build the bytes. */ + #define INSERT(x,y) *x++ = y>>24; *x++ = y>> 16; *x++=y>>8; *x++ =y; + static void -DEFUN (build_bytes, (this_try, operand), - opcode_entry_type * this_try AND - struct z8k_op *operand) +build_bytes (this_try, operand) + opcode_entry_type *this_try; + struct z8k_op *operand ATTRIBUTE_UNUSED; { - unsigned int i; - - int length; - char *output; char *output_ptr = buffer; - char part; int c; - char high; int nib; int nibble; - unsigned short *class_ptr; + unsigned int *class_ptr; frag_wane (frag_now); frag_new (0); - memset (buffer, 20, 0); + memset (buffer, 0, sizeof (buffer)); class_ptr = this_try->byte_info; -top:; - for (nibble = 0; c = *class_ptr++; nibble++) + for (nibble = 0; (c = *class_ptr++); nibble++) { switch (c & CLASS_MASK) { default: - abort (); + case CLASS_ADDRESS: - /* Direct address, we don't cope with the SS mode right now */ + /* Direct address, we don't cope with the SS mode right now. */ if (segmented_mode) { - da_operand->X_add_number |= 0x80000000; + /* da_operand->X_add_number |= 0x80000000; -- Now set at relocation time. */ output_ptr = apply_fix (output_ptr, R_IMM32, da_operand, 8); } else @@ -851,60 +1050,96 @@ top:; da_operand = 0; break; case CLASS_DISP8: - /* pc rel 8 bit */ + /* pc rel 8 bit */ output_ptr = apply_fix (output_ptr, R_JR, da_operand, 2); da_operand = 0; + break; + + case CLASS_0DISP7: + /* pc rel 7 bit */ + *output_ptr = 0; + output_ptr = apply_fix (output_ptr, R_DISP7, da_operand, 2); + da_operand = 0; + break; + case CLASS_1DISP7: + /* pc rel 7 bit */ + *output_ptr = 0x80; + output_ptr = apply_fix (output_ptr, R_DISP7, da_operand, 2); + output_ptr[-2] = 0x8; + da_operand = 0; break; + case CLASS_BIT_1OR2: *output_ptr = c & 0xf; - if (imm_operand) - { - if (imm_operand->X_add_number==2) - { - *output_ptr |= 2; - } - else if (imm_operand->X_add_number != 1) + if (imm_operand) { - as_bad("immediate must be 1 or 2"); + if (imm_operand->X_add_number == 2) + *output_ptr |= 2; + else if (imm_operand->X_add_number != 1) + as_bad (_("immediate must be 1 or 2")); } - } - else - { - as_bad("immediate 1 or 2 expected"); - } + else + as_bad (_("immediate 1 or 2 expected")); output_ptr++; break; case CLASS_CC: *output_ptr++ = the_cc; break; + case CLASS_0CCC: + *output_ptr++ = the_ctrl; + break; + case CLASS_1CCC: + *output_ptr++ = the_ctrl | 0x8; + break; + case CLASS_00II: + *output_ptr++ = (~the_interrupt & 0x3); + break; + case CLASS_01II: + *output_ptr++ = (~the_interrupt & 0x3) | 0x4; + break; + case CLASS_FLAGS: + *output_ptr++ = the_flags; + break; + case CLASS_IGNORE: case CLASS_BIT: *output_ptr++ = c & 0xf; break; case CLASS_REGN0: if (reg[c & 0xf] == 0) - { - as_bad ("can't use R0 here"); - } + as_bad (_("can't use R0 here")); + /* Fall through. */ case CLASS_REG: case CLASS_REG_BYTE: case CLASS_REG_WORD: case CLASS_REG_LONG: case CLASS_REG_QUAD: - /* Insert bit mattern of - right reg */ + /* Insert bit mattern of right reg. */ *output_ptr++ = reg[c & 0xf]; break; case CLASS_DISP: - output_ptr = apply_fix (output_ptr, R_IMM16, da_operand, 4); + switch (c & ARG_MASK) + { + case ARG_DISP12: + output_ptr = apply_fix (output_ptr, R_CALLR, da_operand, 4); + break; + case ARG_DISP16: + output_ptr = apply_fix (output_ptr, R_REL16, da_operand, 4); + break; + default: + output_ptr = apply_fix (output_ptr, R_IMM16, da_operand, 4); + } da_operand = 0; break; - + case CLASS_IMM: { nib = 0; switch (c & ARG_MASK) { + case ARG_NIM4: + imm_operand->X_add_number = -imm_operand->X_add_number; + /* Drop through. */ case ARG_IMM4: output_ptr = apply_fix (output_ptr, R_IMM4L, imm_operand, 1); break; @@ -936,8 +1171,7 @@ top:; } } - /* Copy from the nibble buffer into the frag */ - + /* Copy from the nibble buffer into the frag. */ { int length = (output_ptr - buffer) / 2; char *src = buffer; @@ -949,142 +1183,128 @@ top:; src += 2; fragp++; } - } - } /* This is the guts of the machine-dependent assembler. STR points to a - machine dependent instruction. This funciton is supposed to emit - the frags/bytes it assembles to. - */ + machine dependent instruction. This function is supposed to emit + the frags/bytes it assembles to. */ void -DEFUN (md_assemble, (str), - char *str) +md_assemble (str) + char *str; { + char c; char *op_start; char *op_end; - unsigned int i; struct z8k_op operand[3]; opcode_entry_type *opcode; opcode_entry_type *prev_opcode; - char *dot = 0; - char c; - - /* Drop leading whitespace */ + /* Drop leading whitespace. */ while (*str == ' ') - str++; + str++; - /* find the op code end */ + /* Find the op code end. */ for (op_start = op_end = str; *op_end != 0 && *op_end != ' '; op_end++) - { - } - - ; + ; if (op_end == op_start) - { - as_bad ("can't find opcode "); - } + { + as_bad (_("can't find opcode ")); + } c = *op_end; *op_end = 0; - opcode = (opcode_entry_type *) hash_find (opcode_hash_control, - op_start); - + opcode = (opcode_entry_type *) hash_find (opcode_hash_control, op_start); if (opcode == NULL) - { - as_bad ("unknown opcode"); - return; - } + { + as_bad (_("unknown opcode")); + return; + } - if (opcode->opcode == 250) - { - /* was really a pseudo op */ + if (opcode->opcode == 250) + { + pseudo_typeS *p; + char oc; + char *old = input_line_pointer; + *op_end = c; - pseudo_typeS *p ; - char oc; + /* Was really a pseudo op. */ - char *old = input_line_pointer; - *op_end = c; + input_line_pointer = op_end; - - input_line_pointer = op_end; + oc = *old; + *old = '\n'; + while (*input_line_pointer == ' ') + input_line_pointer++; + p = (pseudo_typeS *) (opcode->func); - oc = *old; - *old = '\n'; - while (*input_line_pointer == ' ') - input_line_pointer++; - p = (pseudo_typeS *)(opcode->func); + (p->poc_handler) (p->poc_val); + input_line_pointer = old; + *old = oc; + } + else + { + char *new_input_line_pointer; - (p->poc_handler)(p->poc_val); - input_line_pointer = old; - *old = oc; - } - else { - input_line_pointer = get_operands (opcode, op_end, - operand); - *op_end = c; - prev_opcode = opcode; + new_input_line_pointer = get_operands (opcode, op_end, operand); + if (new_input_line_pointer) + input_line_pointer = new_input_line_pointer; + prev_opcode = opcode; - opcode = get_specific (opcode, operand); + opcode = get_specific (opcode, operand); - if (opcode == 0) - { - /* Couldn't find an opcode which matched the operands */ - char *where = frag_more (2); + if (opcode == 0) + { + /* Couldn't find an opcode which matched the operands. */ + char *where = frag_more (2); - where[0] = 0x0; - where[1] = 0x0; + where[0] = 0x0; + where[1] = 0x0; - as_bad ("Can't find opcode to match operands"); - return; - } + as_bad (_("Can't find opcode to match operands")); + return; + } - build_bytes (opcode, operand); - } + build_bytes (opcode, operand); + } } void -DEFUN (tc_crawl_symbol_chain, (headers), - object_headers * headers) +tc_crawl_symbol_chain (headers) + object_headers *headers ATTRIBUTE_UNUSED; { - printf ("call to tc_crawl_symbol_chain \n"); + printf (_("call to tc_crawl_symbol_chain \n")); } symbolS * -DEFUN (md_undefined_symbol, (name), - char *name) +md_undefined_symbol (name) + char *name ATTRIBUTE_UNUSED; { return 0; } void -DEFUN (tc_headers_hook, (headers), - object_headers * headers) -{ - printf ("call to tc_headers_hook \n"); -} - -void -DEFUN_VOID (md_end) +tc_headers_hook (headers) + object_headers *headers ATTRIBUTE_UNUSED; { + printf (_("call to tc_headers_hook \n")); } -/* Various routines to kill one day */ -/* Equal to MAX_PRECISION in atof-ieee.c */ +/* Various routines to kill one day. */ +/* Equal to MAX_PRECISION in atof-ieee.c. */ #define MAX_LITTLENUMS 6 -/* Turn a string in input_line_pointer into a floating point constant of type - type, and store the appropriate bytes in *litP. The number of LITTLENUMS - emitted is stored in *sizeP . An error message is returned, or NULL on OK. - */ +/* Turn a string in input_line_pointer into a floating point constant + of type TYPE, and store the appropriate bytes in *LITP. The number + of LITTLENUMS emitted is stored in *SIZEP. An error message is + returned, or NULL on OK. */ + char * md_atof (type, litP, sizeP) char type; @@ -1095,7 +1315,6 @@ md_atof (type, litP, sizeP) LITTLENUM_TYPE words[MAX_LITTLENUMS]; LITTLENUM_TYPE *wordP; char *t; - char *atof_ieee (); switch (type) { @@ -1125,7 +1344,7 @@ md_atof (type, litP, sizeP) default: *sizeP = 0; - return "Bad call to MD_ATOF()"; + return _("Bad call to MD_ATOF()"); } t = atof_ieee (input_line_pointer, type, words); if (t) @@ -1137,81 +1356,80 @@ md_atof (type, litP, sizeP) md_number_to_chars (litP, (long) (*wordP++), sizeof (LITTLENUM_TYPE)); litP += sizeof (LITTLENUM_TYPE); } - return ""; /* Someone should teach Dean about null pointers */ + return 0; } + +const char *md_shortopts = "z:"; -int -md_parse_option (argP, cntP, vecP) - char **argP; - int *cntP; - char ***vecP; - -{ - if (!strcmp(*argP,"z8001")) { - s_segm(); - } - else if (!strcmp(*argP,"z8002")) { - s_unseg(); - } - else return 0; - **argP = 0; - return 1; -} +struct option md_longopts[] = + { + {NULL, no_argument, NULL, 0} + }; -int md_short_jump_size; +size_t md_longopts_size = sizeof (md_longopts); -void -tc_aout_fix_to_chars () +int +md_parse_option (c, arg) + int c; + char *arg; { - printf ("call to tc_aout_fix_to_chars \n"); - abort (); -} + switch (c) + { + case 'z': + if (!strcmp (arg, "8001")) + s_segm (0); + else if (!strcmp (arg, "8002")) + s_unseg (0); + else + { + as_bad (_("invalid architecture -z%s"), arg); + return 0; + } + break; -void -md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol) - char *ptr; - long from_addr; - long to_addr; - fragS *frag; - symbolS *to_symbol; -{ - as_fatal ("failed sanity check."); + default: + return 0; + } + + return 1; } void -md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol) - char *ptr; - long from_addr, to_addr; - fragS *frag; - symbolS *to_symbol; +md_show_usage (stream) + FILE *stream; { - as_fatal ("failed sanity check."); + fprintf (stream, _("\ +Z8K options:\n\ +-z8001 generate segmented code\n\ +-z8002 generate unsegmented code\n")); } - + void -md_convert_frag (headers, fragP) - object_headers *headers; - fragS *fragP; - +md_convert_frag (headers, seg, fragP) + object_headers *headers ATTRIBUTE_UNUSED; + segT seg ATTRIBUTE_UNUSED; + fragS *fragP ATTRIBUTE_UNUSED; { - printf ("call to md_convert_frag \n"); + printf (_("call to md_convert_frag \n")); abort (); } -long -DEFUN (md_section_align, (seg, size), - segT seg AND - long size) +valueT +md_section_align (seg, size) + segT seg; + valueT size; { - return ((size + (1 << section_alignment[(int) seg]) - 1) & (-1 << section_alignment[(int) seg])); - + return ((size + (1 << section_alignment[(int) seg]) - 1) + & (-1 << section_alignment[(int) seg])); } void -md_apply_fix (fixP, val) - fixS *fixP; - long val; +md_apply_fix3 (fixP, valP, segment) + fixS * fixP; + valueT * valP; + segT segment ATTRIBUTE_UNUSED; { + long val = * (long *) valP; char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; switch (fixP->fx_r_type) @@ -1223,13 +1441,25 @@ md_apply_fix (fixP, val) case R_JR: *buf++ = val; - /* if (val != 0) abort();*/ +#if 0 + if (val != 0) + abort (); +#endif + break; + + case R_DISP7: + + *buf++ += val; +#if 0 + if (val != 0) + abort (); +#endif break; case R_IMM8: buf[0] += val; break; - case R_IMM16: + case R_IMM16: *buf++ = (val >> 8); *buf++ = val; break; @@ -1248,59 +1478,48 @@ md_apply_fix (fixP, val) break; #endif + case 0: + md_number_to_chars (buf, val, fixP->fx_size); + break; + default: abort (); - } -} -void -DEFUN (md_operand, (expressionP), expressionS * expressionP) -{ + if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0) + fixP->fx_done = 1; } -int md_long_jump_size; int md_estimate_size_before_relax (fragP, segment_type) - register fragS *fragP; - register segT segment_type; + register fragS *fragP ATTRIBUTE_UNUSED; + register segT segment_type ATTRIBUTE_UNUSED; { - printf ("call tomd_estimate_size_before_relax \n"); + printf (_("call tomd_estimate_size_before_relax\n")); abort (); } -/* Put number into target byte order */ +/* Put number into target byte order. */ void -DEFUN (md_number_to_chars, (ptr, use, nbytes), - char *ptr AND - long use AND - int nbytes) +md_number_to_chars (ptr, use, nbytes) + char *ptr; + valueT use; + int nbytes; { - switch (nbytes) - { - case 4: - *ptr++ = (use >> 24) & 0xff; - case 3: - *ptr++ = (use >> 16) & 0xff; - case 2: - *ptr++ = (use >> 8) & 0xff; - case 1: - *ptr++ = (use >> 0) & 0xff; - break; - default: - abort (); - } + number_to_chars_bigendian (ptr, use, nbytes); } + long md_pcrel_from (fixP) - fixS *fixP; + fixS *fixP ATTRIBUTE_UNUSED; { abort (); } void -tc_coff_symbol_emit_hook () +tc_coff_symbol_emit_hook (s) + symbolS *s ATTRIBUTE_UNUSED; { } @@ -1313,43 +1532,54 @@ tc_reloc_mangle (fix_ptr, intr, base) { symbolS *symbol_ptr; + if (fix_ptr->fx_addsy + && fix_ptr->fx_subsy) + { + symbolS *add = fix_ptr->fx_addsy; + symbolS *sub = fix_ptr->fx_subsy; + + if (S_GET_SEGMENT (add) != S_GET_SEGMENT (sub)) + as_bad (_("Can't subtract symbols in different sections %s %s"), + S_GET_NAME (add), S_GET_NAME (sub)); + else + { + int diff = S_GET_VALUE (add) - S_GET_VALUE (sub); + + fix_ptr->fx_addsy = 0; + fix_ptr->fx_subsy = 0; + fix_ptr->fx_offset += diff; + } + } symbol_ptr = fix_ptr->fx_addsy; /* If this relocation is attached to a symbol then it's ok - to output it */ + to output it. */ if (fix_ptr->fx_r_type == 0) - { - /* cons likes to create reloc32's whatever the size of the reloc.. - */ - switch (fix_ptr->fx_size) { - - case 2: - intr->r_type = R_IMM16; - break; - case 1: - intr->r_type = R_IMM8; - break; - case 4: - intr->r_type = R_IMM32; - break; - default: - abort (); - + /* cons likes to create reloc32's whatever the size of the reloc. */ + switch (fix_ptr->fx_size) + { + case 2: + intr->r_type = R_IMM16; + break; + case 1: + intr->r_type = R_IMM8; + break; + case 4: + intr->r_type = R_IMM32; + break; + default: + abort (); + } } - - } else - { intr->r_type = fix_ptr->fx_r_type; - } intr->r_vaddr = fix_ptr->fx_frag->fr_address + fix_ptr->fx_where + base; intr->r_offset = fix_ptr->fx_offset; if (symbol_ptr) - intr->r_symndx = symbol_ptr->sy_number; + intr->r_symndx = symbol_ptr->sy_number; else - intr->r_symndx = -1; - + intr->r_symndx = -1; }