diff options
| -rw-r--r-- | gas/app.c | 13 | ||||
| -rw-r--r-- | gas/as.h | 1 | ||||
| -rw-r--r-- | gas/input-scrub.c | 6 | ||||
| -rw-r--r-- | gas/macro.c | 2 | ||||
| -rw-r--r-- | gas/sb.c | 5 | ||||
| -rw-r--r-- | gas/testsuite/config/default.exp | 8 | ||||
| -rw-r--r-- | gas/testsuite/gas/macros/app5.d | 6 | ||||
| -rw-r--r-- | gas/testsuite/gas/macros/app5.s | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/macros/macros.exp | 1 |
9 files changed, 43 insertions, 4 deletions
@@ -1537,3 +1537,16 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen) last_char = to[-1]; return to - tostart; } + +/* Return amount of pending input. */ + +size_t +do_scrub_pending (void) +{ + size_t len = 0; + if (saved_input) + len += saved_input_len; + if (state == -1) + len += strlen (out_string); + return len; +} @@ -471,6 +471,7 @@ void input_scrub_insert_file (char *); char * input_scrub_new_file (const char *); char * input_scrub_next_buffer (char **bufp); size_t do_scrub_chars (size_t (*get) (char *, size_t), char *, size_t); +size_t do_scrub_pending (void); bool scan_for_multibyte_characters (const unsigned char *, const unsigned char *, bool); int gen_to_words (LITTLENUM_TYPE *, int, long); int had_err (void); diff --git a/gas/input-scrub.c b/gas/input-scrub.c index ec0b007..44e4bdc 100644 --- a/gas/input-scrub.c +++ b/gas/input-scrub.c @@ -278,9 +278,11 @@ input_scrub_include_sb (sb *from, char *position, enum expansion expansion) next_saved_file = input_scrub_push (position); - /* Allocate sufficient space: from->len + optional newline. */ + /* Allocate sufficient space: from->len plus optional newline + plus two ".linefile " directives, plus a little more for other + expansion. */ newline = from->len >= 1 && from->ptr[0] != '\n'; - sb_build (&from_sb, from->len + newline); + sb_build (&from_sb, from->len + newline + 2 * sizeof (".linefile") + 30); if (expansion == expanding_repeat && from_sb_expansion >= expanding_macro) expansion = expanding_nested; from_sb_expansion = expansion; diff --git a/gas/macro.c b/gas/macro.c index d799ba5..c2a4768 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -1046,6 +1046,8 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, loclist = f; } + if (!err && (out->len == 0 || out->ptr[out->len - 1] != '\n')) + sb_add_char (out, '\n'); return err; } @@ -119,11 +119,12 @@ sb_scrub_and_add_sb (sb *ptr, sb *s) So we loop until the input S is consumed. */ while (1) { - size_t copy = s->len - (scrub_position - s->ptr); + size_t copy = s->len - (scrub_position - s->ptr) + do_scrub_pending (); if (copy == 0) break; sb_check (ptr, copy); - ptr->len += do_scrub_chars (scrub_from_sb, ptr->ptr + ptr->len, copy); + ptr->len += do_scrub_chars (scrub_from_sb, ptr->ptr + ptr->len, + ptr->max - ptr->len); } sb_to_scrub = 0; diff --git a/gas/testsuite/config/default.exp b/gas/testsuite/config/default.exp index 5a3dda9..21859d9 100644 --- a/gas/testsuite/config/default.exp +++ b/gas/testsuite/config/default.exp @@ -52,6 +52,14 @@ if ![info exists NMFLAGS] then { set NMFLAGS {} } +if ![info exists SIZE] then { + set SIZE [findfile $base_dir/size] +} + +if ![info exists SIZEFLAGS] then { + set SIZEFLAGS "" +} + if ![info exists OBJCOPY] then { set OBJCOPY [findfile $base_dir/../../binutils/objcopy] } diff --git a/gas/testsuite/gas/macros/app5.d b/gas/testsuite/gas/macros/app5.d new file mode 100644 index 0000000..0a1483c --- /dev/null +++ b/gas/testsuite/gas/macros/app5.d @@ -0,0 +1,6 @@ +#name: APP with linefile +#xfail: tic30-*-* +#size: -G +# pr29466 just check that the test assembles + +#pass diff --git a/gas/testsuite/gas/macros/app5.s b/gas/testsuite/gas/macros/app5.s new file mode 100644 index 0000000..a960ae2 --- /dev/null +++ b/gas/testsuite/gas/macros/app5.s @@ -0,0 +1,5 @@ +#NO_APP +#APP +# 5 "foo.c" 1 +# 0 "" 2 +#NO_APP diff --git a/gas/testsuite/gas/macros/macros.exp b/gas/testsuite/gas/macros/macros.exp index 915c45d..7a45af4 100644 --- a/gas/testsuite/gas/macros/macros.exp +++ b/gas/testsuite/gas/macros/macros.exp @@ -70,6 +70,7 @@ run_dump_test app2 run_dump_test app3 remote_download host "$srcdir/$subdir/app4b.s" run_dump_test app4 +run_dump_test app5 run_list_test badarg "" |