From 5d5b0bd35f1f8b8484349c3ec51aa8e19a1627cf Mon Sep 17 00:00:00 2001 From: Jozef Lawrynowicz Date: Thu, 18 Apr 2019 13:15:09 +0100 Subject: [PATCH] MSP430 Assembler: Define symbols for functions to run through. gas * config/tc-msp430.c (msp430_make_init_symbols): Define __crt0_run_{preinit,init,fini}_array symbols if .{preinit,init,fini}_array sections exist. * testsuite/gas/msp430/fini-array.d: New test. * testsuite/gas/msp430/init-array.d: New test. * testsuite/gas/msp430/preinit-array.d: New test. * testsuite/gas/msp430/fini-array.s: New test source. * testsuite/gas/msp430/init-array.s: New test source. * testsuite/gas/msp430/preinit-array.s: New test source. * testsuite/gas/msp430/msp430.exp: Add new tests to driver. --- gas/ChangeLog | 13 +++++++ gas/config/tc-msp430.c | 44 ++++++++++++++++++++---- gas/testsuite/gas/msp430/fini-array.d | 7 ++++ gas/testsuite/gas/msp430/fini-array.s | 22 ++++++++++++ gas/testsuite/gas/msp430/init-array.d | 7 ++++ gas/testsuite/gas/msp430/init-array.s | 22 ++++++++++++ gas/testsuite/gas/msp430/msp430.exp | 3 ++ gas/testsuite/gas/msp430/preinit-array.d | 7 ++++ gas/testsuite/gas/msp430/preinit-array.s | 22 ++++++++++++ 9 files changed, 141 insertions(+), 6 deletions(-) create mode 100644 gas/testsuite/gas/msp430/fini-array.d create mode 100644 gas/testsuite/gas/msp430/fini-array.s create mode 100644 gas/testsuite/gas/msp430/init-array.d create mode 100644 gas/testsuite/gas/msp430/init-array.s create mode 100644 gas/testsuite/gas/msp430/preinit-array.d create mode 100644 gas/testsuite/gas/msp430/preinit-array.s diff --git a/gas/ChangeLog b/gas/ChangeLog index 60005e0872..922ffebcc0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,16 @@ +2019-04-18 Jozef Lawrynowicz + + * config/tc-msp430.c (msp430_make_init_symbols): Define + __crt0_run_{preinit,init,fini}_array symbols if + .{preinit,init,fini}_array sections exist. + * testsuite/gas/msp430/fini-array.d: New test. + * testsuite/gas/msp430/init-array.d: New test. + * testsuite/gas/msp430/preinit-array.d: New test. + * testsuite/gas/msp430/fini-array.s: New test source. + * testsuite/gas/msp430/init-array.s: New test source. + * testsuite/gas/msp430/preinit-array.s: New test source. + * testsuite/gas/msp430/msp430.exp: Add new tests to driver. + 2019-04-17 Jozef Lawrynowicz * config/tc-msp430.c (msp430_make_init_symbols): Define __crt0_init_bss diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c index 7868331bb9..5821b1c811 100644 --- a/gas/config/tc-msp430.c +++ b/gas/config/tc-msp430.c @@ -209,9 +209,9 @@ static struct hash_control *msp430_hash; #define CEBL 4 /* Length. */ -#define STATE_BITS10 1 /* wild guess. short jump */ -#define STATE_WORD 2 /* 2 bytes pc rel. addr. more */ -#define STATE_UNDEF 3 /* cannot handle this yet. convert to word mode */ +#define STATE_BITS10 1 /* Wild guess. short jump. */ +#define STATE_WORD 2 /* 2 bytes pc rel. addr. more. */ +#define STATE_UNDEF 3 /* Cannot handle this yet. convert to word mode. */ #define ENCODE_RELAX(what,length) (((what) << 2) + (length)) #define RELAX_STATE(s) ((s) & 3) @@ -415,6 +415,7 @@ parse_exp (char * s, expressionS * op) expression (op); if (op->X_op == O_absent) as_bad (_("missing operand")); + /* Our caller is likely to check that the entire expression was parsed. If we have found a hex constant with an 'h' suffix, ilp will be left pointing at the 'h', so skip it here. */ @@ -1520,6 +1521,32 @@ msp430_make_init_symbols (const char * name) || strncmp (name, ".either.bss", 11) == 0 || upper_data_region_in_use) (void) symbol_find_or_make ("__crt0_init_highbss"); + + /* The following symbols are for the crt0 functions that run through + the different .*_array sections and call the functions placed there. + - init_array stores global static C++ constructors to run before main. + - preinit_array is not expected to ever be used for MSP430. + GCC only places initialization functions for runtime "sanitizers" + (i.e. {a,l,t,u}san) and "virtual table verification" in preinit_array. + - fini_array stores global static C++ destructors to run after calling + exit() or returning from main. + __crt0_run_array is required to actually call the functions in the above + arrays. */ + if (strncmp (name, ".init_array", 11) == 0) + { + (void) symbol_find_or_make ("__crt0_run_init_array"); + (void) symbol_find_or_make ("__crt0_run_array"); + } + else if (strncmp (name, ".preinit_array", 14) == 0) + { + (void) symbol_find_or_make ("__crt0_run_preinit_array"); + (void) symbol_find_or_make ("__crt0_run_array"); + } + else if (strncmp (name, ".fini_array", 11) == 0) + { + (void) symbol_find_or_make ("__crt0_run_fini_array"); + (void) symbol_find_or_make ("__crt0_run_array"); + } } static void @@ -2003,8 +2030,8 @@ msp430_srcoperand (struct msp430_operand_s * op, { char *h = l; - op->reg = 2; /* reg 2 in absolute addr mode. */ - op->am = 1; /* mode As == 01 bin. */ + op->reg = 2; /* Reg 2 in absolute addr mode. */ + op->am = 1; /* Mode As == 01 bin. */ op->ol = 1; /* Immediate value followed by instruction. */ __tl = h + 1; end = parse_exp (__tl, &(op->exp)); @@ -2554,6 +2581,7 @@ gen_nop (void) } /* Insert/inform about adding a NOP if this insn enables interrupts. */ + static void warn_eint_nop (bfd_boolean prev_insn_is_nop, bfd_boolean prev_insn_is_dint) { @@ -2564,6 +2592,7 @@ warn_eint_nop (bfd_boolean prev_insn_is_nop, bfd_boolean prev_insn_is_dint) /* 430 ISA does not require a NOP before EINT. */ || (! target_is_430x ())) return; + if (gen_interrupt_nops) { gen_nop (); @@ -2576,6 +2605,7 @@ warn_eint_nop (bfd_boolean prev_insn_is_nop, bfd_boolean prev_insn_is_dint) /* Use when unsure what effect the insn will have on the interrupt status, to insert/warn about adding a NOP before the current insn. */ + static void warn_unsure_interrupt (bfd_boolean prev_insn_is_nop, bfd_boolean prev_insn_is_dint) @@ -2587,6 +2617,7 @@ warn_unsure_interrupt (bfd_boolean prev_insn_is_nop, /* 430 ISA does not require a NOP before EINT or DINT. */ || (! target_is_430x ())) return; + if (gen_interrupt_nops) { gen_nop (); @@ -2856,7 +2887,8 @@ msp430_operands (struct msp430_opcode_s * opcode, char * line) switch (fmt) { - case 0: /* Emulated. */ + case 0: + /* Emulated. */ switch (opcode->insn_opnumb) { case 0: diff --git a/gas/testsuite/gas/msp430/fini-array.d b/gas/testsuite/gas/msp430/fini-array.d new file mode 100644 index 0000000000..c9cf572b67 --- /dev/null +++ b/gas/testsuite/gas/msp430/fini-array.d @@ -0,0 +1,7 @@ +#objdump: -t +#name: Check symbols to run .fini_array functions have been defined +#... +.*__crt0_run_fini_array.* +#... +.*__crt0_run_array.* +#pass diff --git a/gas/testsuite/gas/msp430/fini-array.s b/gas/testsuite/gas/msp430/fini-array.s new file mode 100644 index 0000000000..54d1ad22a4 --- /dev/null +++ b/gas/testsuite/gas/msp430/fini-array.s @@ -0,0 +1,22 @@ + .file "main.c" + .section .fini_array,"aw" + .balign 2 + .short 42 +.text + .balign 2 + .global main + .type main, @function +main: +; start of function +; framesize_regs: 0 +; framesize_locals: 0 +; framesize_outgoing: 0 +; framesize: 0 +; elim ap -> fp 2 +; elim fp -> sp 0 +; saved regs:(none) + ; start of prologue + ; end of prologue +.L2: + BR #.L2 + .size main, .-main diff --git a/gas/testsuite/gas/msp430/init-array.d b/gas/testsuite/gas/msp430/init-array.d new file mode 100644 index 0000000000..d3fa5979c8 --- /dev/null +++ b/gas/testsuite/gas/msp430/init-array.d @@ -0,0 +1,7 @@ +#objdump: -t +#name: Check symbols to run .init_array functions have been defined +#... +.*__crt0_run_init_array.* +#... +.*__crt0_run_array.* +#pass diff --git a/gas/testsuite/gas/msp430/init-array.s b/gas/testsuite/gas/msp430/init-array.s new file mode 100644 index 0000000000..b049ec4498 --- /dev/null +++ b/gas/testsuite/gas/msp430/init-array.s @@ -0,0 +1,22 @@ + .file "main.c" + .section .init_array,"aw" + .balign 2 + .short 42 +.text + .balign 2 + .global main + .type main, @function +main: +; start of function +; framesize_regs: 0 +; framesize_locals: 0 +; framesize_outgoing: 0 +; framesize: 0 +; elim ap -> fp 2 +; elim fp -> sp 0 +; saved regs:(none) + ; start of prologue + ; end of prologue +.L2: + BR #.L2 + .size main, .-main diff --git a/gas/testsuite/gas/msp430/msp430.exp b/gas/testsuite/gas/msp430/msp430.exp index 0f7805da3e..9c7a1975f9 100644 --- a/gas/testsuite/gas/msp430/msp430.exp +++ b/gas/testsuite/gas/msp430/msp430.exp @@ -43,4 +43,7 @@ if [expr [istarget "msp430-*-*"]] then { run_dump_test "nop-unknown-intr-430" run_dump_test "nop-unknown-intr-430x" run_dump_test "nop-unknown-intr-430x-ignore" + run_dump_test "preinit-array" + run_dump_test "init-array" + run_dump_test "fini-array" } diff --git a/gas/testsuite/gas/msp430/preinit-array.d b/gas/testsuite/gas/msp430/preinit-array.d new file mode 100644 index 0000000000..8401adcd06 --- /dev/null +++ b/gas/testsuite/gas/msp430/preinit-array.d @@ -0,0 +1,7 @@ +#objdump: -t +#name: Check symbols to run .preinit_array functions have been defined +#... +.*__crt0_run_preinit_array.* +#... +.*__crt0_run_array.* +#pass diff --git a/gas/testsuite/gas/msp430/preinit-array.s b/gas/testsuite/gas/msp430/preinit-array.s new file mode 100644 index 0000000000..563326aef8 --- /dev/null +++ b/gas/testsuite/gas/msp430/preinit-array.s @@ -0,0 +1,22 @@ + .file "main.c" + .section .preinit_array,"aw" + .balign 2 + .short 42 +.text + .balign 2 + .global main + .type main, @function +main: +; start of function +; framesize_regs: 0 +; framesize_locals: 0 +; framesize_outgoing: 0 +; framesize: 0 +; elim ap -> fp 2 +; elim fp -> sp 0 +; saved regs:(none) + ; start of prologue + ; end of prologue +.L2: + BR #.L2 + .size main, .-main -- 2.34.1