Browse Source

Added DBG2

tags/v0.9.3
Michael Brown 19 years ago
parent
commit
d281996ef8
2 changed files with 12 additions and 5 deletions
  1. 4
    1
      src/Makefile
  2. 8
    4
      src/Makefile.housekeeping

+ 4
- 1
src/Makefile View File

@@ -71,9 +71,11 @@ SIZE		?= $(CROSS_COMPILE)size
71 71
 AR		?= $(CROSS_COMPILE)ar
72 72
 RANLIB		?= $(CROSS_COMPILE)ranlib
73 73
 OBJCOPY		?= $(CROSS_COMPILE)objcopy
74
+NM		?= $(CROSS_COMPILE)nm
74 75
 PARSEROM	?= $(PERL) ./util/parserom.pl
75 76
 MAKEROM		?= $(PERL) ./util/makerom.pl
76 77
 MKCONFIG	?= $(PERL) ./util/mkconfig.pl
78
+SYMCHECK	?= $(PERL) ./util/symcheck.pl
77 79
 NRV2B		?= ./util/nrv2b
78 80
 
79 81
 # Location to place generated files
@@ -111,6 +113,7 @@ $(BIN)/%.flags :
111 113
 COMPILE_c	= $(CC) $(CFLAGS) $(CFLAGS_c) $(OBJ_CFLAGS)
112 114
 RULE_c		= $(COMPILE_c) -c $< -o $@
113 115
 RULE_c_to_dbg.o	= $(COMPILE_c) -Ddebug_$(OBJECT) -c $< -o $@
116
+RULE_c_to_dbg2.o = $(COMPILE_c) -Ddebug_$(OBJECT)=2 -c $< -o $@
114 117
 RULE_c_to_c	= $(COMPILE_c) -E -c $< > $@
115 118
 RULE_c_to_s	= $(COMPILE_c) -S -c $< -o $@ 
116 119
 
@@ -119,7 +122,7 @@ ASSEMBLE_S	= $(AS) $(ASFLAGS)
119 122
 RULE_S		= $(PREPROCESS_S) $< | $(ASSEMBLE_S) -o $@
120 123
 RULE_S_to_s	= $(PREPROCESS_S) $< > $@
121 124
 
122
-DEBUG_TARGETS	+= dbg.o c s
125
+DEBUG_TARGETS	+= dbg2.o dbg.o c s
123 126
 
124 127
 # SRCDIRS lists all directories containing source files.
125 128
 #

+ 8
- 4
src/Makefile.housekeeping View File

@@ -225,9 +225,13 @@ TGT_MAKEROM_FLAGS = $(strip $(MAKEROM_FLAGS_$(TGT_ROM_NAME)) \
225 225
 # the target.
226 226
 #
227 227
 COMMA		:= ,
228
-DEBUG_OBJS	= $(foreach D,$(subst $(COMMA), ,$(DEBUG)),$(BIN)/$(D).dbg.o)
229
-DEBUG_REPLACE_OBJS = $(foreach D,$(subst $(COMMA), ,$(DEBUG)),$(BIN)/$(D).o)
230
-BLIB_OBJS	= $(DEBUG_OBJS) $(filter-out $(DEBUG_REPLACE_OBJS),$(BOBJS))
228
+DEBUG_LIST	= $(subst $(COMMA), ,$(DEBUG))
229
+DEBUG_OBJ_BASE	= $(word 1,$(subst :, ,$(1))).dbg$(word 2,$(subst :, ,$(1)))
230
+DEBUG_OBJ	= $(BIN)/$(call DEBUG_OBJ_BASE,$(1)).o
231
+DEBUG_ORIG_OBJ	= $(BIN)/$(word 1,$(subst :, ,$(1))).o
232
+DEBUG_OBJS	= $(foreach D,$(DEBUG_LIST),$(call DEBUG_OBJ,$(D)))
233
+DEBUG_ORIG_OBJS	= $(foreach D,$(DEBUG_LIST),$(call DEBUG_ORIG_OBJ,$(D)))
234
+BLIB_OBJS	= $(DEBUG_OBJS) $(filter-out $(DEBUG_ORIG_OBJS),$(BOBJS))
231 235
 
232 236
 # Print out all derived information for a given target.
233 237
 #
@@ -251,7 +255,7 @@ $(BIN)/%.info :
251 255
 	@echo 'makerom target flags : $(TGT_MAKEROM_FLAGS)'
252 256
 	@echo
253 257
 	@echo 'Debugging objects    : $(DEBUG_OBJS)'
254
-	@echo 'Replaced objects     : $(DEBUG_REPLACE_OBJS)'
258
+	@echo 'Replaced objects     : $(DEBUG_ORIG_OBJS)'
255 259
 
256 260
 # List of objects included in the last build of blib.  This is needed
257 261
 # in order to correctly rebuild blib whenever the list of objects

Loading…
Cancel
Save