diff options
-rw-r--r-- | gas/ChangeLog | 9 | ||||
-rw-r--r-- | gas/config/tc-pru.c | 22 | ||||
-rw-r--r-- | gas/config/tc-pru.h | 10 | ||||
-rw-r--r-- | ld/ldlex.l | 2 |
4 files changed, 36 insertions, 7 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 54928d8..b704d8c 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2018-08-03 Dimitar Dimitrov <dimitar@dinux.eu> + + * config/tc-pru.c (pru_regname_to_dw2regnum): Return the starting HW + byte-register number. + (pru_frame_initial_instructions): Use byte-numbering for FP index. + * config/tc-pru.h (DWARF2_DEFAULT_RETURN_COLUMN): Use number from + latest GCC. + (DWARF2_CIE_DATA_ALIGNMENT): Set to -1. + 2018-08-03 Jan Beulich <jbeulich@suse.com> * config/tc-i386.c (Operand_Mem): Define. diff --git a/gas/config/tc-pru.c b/gas/config/tc-pru.c index 5121b1f..5a35a78 100644 --- a/gas/config/tc-pru.c +++ b/gas/config/tc-pru.c @@ -1920,14 +1920,28 @@ pru_cons_fix_new (fragS *frag, int where, unsigned int nbytes, } /* Implement tc_regname_to_dw2regnum, to convert REGNAME to a DWARF-2 - register number. */ + register number. Return the starting HW byte-register number. */ + int pru_regname_to_dw2regnum (char *regname) { + static const unsigned int regstart[RSEL_NUM_ITEMS] = + { + [RSEL_7_0] = 0, + [RSEL_15_8] = 1, + [RSEL_23_16] = 2, + [RSEL_31_24] = 3, + [RSEL_15_0] = 0, + [RSEL_23_8] = 1, + [RSEL_31_16] = 2, + [RSEL_31_0] = 0, + }; + struct pru_reg *r = pru_reg_lookup (regname); - if (r == NULL) + + if (r == NULL || r->regsel >= RSEL_NUM_ITEMS) return -1; - return r->index; + return r->index * 4 + regstart[r->regsel]; } /* Implement tc_cfi_frame_initial_instructions, to initialize the DWARF-2 @@ -1935,7 +1949,7 @@ pru_regname_to_dw2regnum (char *regname) void pru_frame_initial_instructions (void) { - const unsigned fp_regno = 4; + const unsigned fp_regno = 4 * 4; cfi_add_CFA_def_cfa (fp_regno, 0); } diff --git a/gas/config/tc-pru.h b/gas/config/tc-pru.h index bc47851..83d1ab8 100644 --- a/gas/config/tc-pru.h +++ b/gas/config/tc-pru.h @@ -138,8 +138,14 @@ extern int pru_validate_fix_sub (struct fix *); /* We want .cfi_* pseudo-ops for generating unwind info. */ #define TARGET_USE_CFIPOP 1 -#define DWARF2_DEFAULT_RETURN_COLUMN 31 -#define DWARF2_CIE_DATA_ALIGNMENT (-4) + +/* Program Counter register number is not defined by TI documents. + Pick the virtual number used by GCC. */ +#define DWARF2_DEFAULT_RETURN_COLUMN 132 + +/* The stack grows down, and is only byte aligned. */ +#define DWARF2_CIE_DATA_ALIGNMENT -1 + #define tc_regname_to_dw2regnum pru_regname_to_dw2regnum extern int pru_regname_to_dw2regnum (char *regname); #define tc_cfi_frame_initial_instructions pru_frame_initial_instructions @@ -424,7 +424,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)* /* PR ld/20906. A corrupt input file can contain bogus strings. */ len = strlen (yylval.name); - if (len > yyleng - 2) + if (len > (bfd_size_type) yyleng - 2) len = yyleng - 2; yylval.name[len] = 0; return NAME; |