Add support for macros.

	* as.c: Include sb.h and macro.h.
	(max_macro_next): New global variable.
	(main): Call macro_init.
	(macro_expr): New static function.
	* as.h (max_macro_nest): Declare.
	* read.c (line_label): Rename from mri_line_label.  Change all
	uses.
	(potable): Add exitm, irp, irpc, macro, mexit, rept.
	(read_a_source_file): Always clear line_label at the start of a
	line, not just when flag_mri or LABELS_WITHOUT_COLONS.  Fixup
	MRI/LABELS_WITHOUT_COLONS handling.  In MRI mode, permit label:
	equ val.  Set line_label when calling colon.  In MRI mode, a
	leading '.' does not imply a pseudo-op.  Check for macro expansion
	before calling md_assemble.
	(s_irp): New function.
	(get_line_sb): New static function.
	(s_macro): New function.
	(s_mexit): New function.
	(s_rept): New function.
	* read.h (line_label): Rename from mri_line_label.
	(s_irp, s_rept): Declare.
	(s_macro, s_mexit): Declare.
	* input-scrub.c: Include sb.h.
	(sb_index, from_sb): New static variables.
	(macro_nest): New static variable.
	(struct input_save): Add sb_index and from_sb fields.  Change
	next_saved_file field to be struct input_save *.
	(next_saved_file): Changed to be struct input_save *.
	(input_scrub_push): Change to return type struct input_save *.
	Save sb_index and from_sb.
	(input_scrub_pop): Change parameter type to struct input_save *.
	Restore sb_index and from_sb.
	(input_scrub_include_sb): New function.
	(input_scrub_next_buffer): Handle reading from from_sb.
	(bump_line_counters): Only increment lines if not using from_sb.
	* config/tc-m68k.c (opt_table): Add nest.
	(opt_nest): New static function.
	* gasp.c: Include sb.h and macro.h.  Move all sb related functions
	and definitions to sb.h and sb.c.  Move all macro related
	functions and definitions to macro.h and macro.c.
	* sb.h, sb.c: New files, extracted from gasp.c.
	* macro.h, macro.c: Likewise.
	* Makefile.in (OBJS): Add sb.o and macro.o
	(GASPOBJS): Define.
	(gasp.new): Depend upon $(GASPOBJS).  Use $(GASPOBJS) to link.
	(TARG_CPU_DEP_m68k): Depend upon subsegs.h.
	(gasp.o): Depend upon sb.h and macro.h.
	(sb.o): New target.
	(macro.o): New target.
	(as.o): Depend upon sb.h and macro.h.
	(input-scrub.o): Depend upon sb.h.
	(read.o): Depend upon sb.h and macro.h.

1 files changed, 19 insertions, 7 deletions

diff --git a/gas/Makefile.in b/gas/Makefile.in
index dc1d112..c997b59 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -163,6 +163,8 @@ LINKED_HEADERS = \
 
 HEADERS = $(LINKED_HEADERS) $(REAL_HEADERS)
 
+TE_OBJS=
+
 # @target_frag@
 
 OBJS = \
@@ -192,9 +194,17 @@ OBJS = \
 	listing.o \
 	ecoff.o \
 	stabs.o \
+	sb.o \
+	macro.o \
 	@extra_objects@ \
 	$(TE_OBJS)
 
+GASPOBJS = \
+	gasp.o \
+	macro.o \
+	sb.o \
+	hash.o
+
 all: .gdbinit as.new gasp.new
 	@srcroot=`cd $(srcroot); pwd`; export srcroot; \
 	(cd doc ; $(MAKE) $(FLAGS_TO_PASS) all)
@@ -245,8 +255,8 @@ $(OBJS): config.h as.h targ-env.h obj-format.h targ-cpu.h flonum.h expr.h \
 	struc-symbol.h write.h frags.h hash.h read.h symbols.h tc.h obj.h \
 	listing.h bignum.h
 
-gasp.new: gasp.o
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o gasp.new gasp.o $(LIBS) $(LOADLIBES)
+gasp.new: $(GASPOBJS)
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o gasp.new $(GASPOBJS) $(LIBS) $(LOADLIBES)
 
 installcheck:
 	@echo No installcheck target is available yet for the GNU assembler.
@@ -291,7 +301,7 @@ TARG_CPU_DEP_i386    = $(srcdir)/../include/opcode/i386.h
 TARG_CPU_DEP_i860    =
 TARG_CPU_DEP_i960    =
 TARG_CPU_DEP_m68k    = $(srcdir)/../include/opcode/m68k.h \
-			$(srcdir)/config/m68k-parse.h
+			$(srcdir)/config/m68k-parse.h subsegs.h
 TARG_CPU_DEP_m88k    = $(srcdir)/config/m88k-opcode.h
 TARG_CPU_DEP_mips    = $(srcdir)/../include/opcode/mips.h
 TARG_CPU_DEP_ns32k   =
@@ -306,9 +316,11 @@ TARG_CPU_DEP_vax     =
 TARG_CPU_DEP_w65     = $(srcdir)/../opcodes/w65-opc.h
 TARG_CPU_DEP_z8k     = $(srcdir)/../opcodes/z8k-opc.h
 
-gasp.o : gasp.c config.h
+gasp.o : gasp.c sb.h macro.h config.h
+sb.o : sb.c sb.h config.h
+macro.o : macro.c macro.h sb.h hash.h config.h
 app.o : app.c write.h
-as.o : as.c output-file.h write.h subsegs.h
+as.o : as.c output-file.h write.h subsegs.h sb.h macro.h
 atof-generic.o : atof-generic.c
 bignum-copy.o : bignum-copy.c
 cond.o : cond.c
@@ -320,12 +332,12 @@ flonum-mult.o : flonum-mult.c
 frags.o : frags.c subsegs.h
 hash.o : hash.c
 input-file.o : input-file.c input-file.h
-input-scrub.o : input-scrub.c input-file.h
+input-scrub.o : input-scrub.c input-file.h sb.h
 listing.o : listing.c input-file.h subsegs.h
 literal.o : literal.c subsegs.h
 messages.o : messages.c
 output-file.o : output-file.c output-file.h
-read.o : read.c
+read.o : read.c sb.h macro.h
 subsegs.o : subsegs.c subsegs.h
 symbols.o : symbols.c subsegs.h
 write.o : write.c subsegs.h output-file.h