mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Small Makefile cleanup.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2007-09-14 16:31:17 +02:00
parent 58d6cbc6ac
commit 0d1bbb19ce
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/stub/src/arch/i086/Makefile.extra
View File

@ -217,7 +217,7 @@ cc_test_bc : tc_list = method-lzma arch-i086 default
cc_test_bc: cc_test.c $(CC_TEST_DEPS) cc_test_bc: cc_test.c $(CC_TEST_DEPS)
$(call tc,bcc) $(PP_FLAGS) -c -otmp/$T.obj $< $(call tc,bcc) $(PP_FLAGS) -c -otmp/$T.obj $<
$(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm $(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm
cc_test_all: cc_test_bc cc_test-all: cc_test_bc
endif endif
ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),) ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),)
@ -225,7 +225,7 @@ cc_test_dm : tc_list = method-lzma arch-i086 default
cc_test_dm: cc_test.c $(CC_TEST_DEPS) cc_test_dm: cc_test.c $(CC_TEST_DEPS)
$(call tc,dmc) $(PP_FLAGS) -c -otmp/$T.obj $< $(call tc,dmc) $(PP_FLAGS) -c -otmp/$T.obj $<
$(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm $(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm
cc_test_all: cc_test_dm cc_test-all: cc_test_dm
endif endif
ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),) ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),)
@ -233,7 +233,7 @@ cc_test_vc : tc_list = method-lzma arch-i086 default
cc_test_vc: cc_test.c $(CC_TEST_DEPS) cc_test_vc: cc_test.c $(CC_TEST_DEPS)
$(call tc,cl) $(PP_FLAGS) -c -Fotmp/$T.obj $< $(call tc,cl) $(PP_FLAGS) -c -Fotmp/$T.obj $<
$(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm $(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm
cc_test_all: cc_test_vc cc_test-all: cc_test_vc
endif endif
ifneq ($(wildcard $(WATCOM)/binl/wcl),) ifneq ($(wildcard $(WATCOM)/binl/wcl),)
@ -241,10 +241,10 @@ cc_test_wc : tc_list = method-lzma arch-i086 default
cc_test_wc: cc_test.c $(CC_TEST_DEPS) cc_test_wc: cc_test.c $(CC_TEST_DEPS)
$(call tc,wcl) $(PP_FLAGS) -c -fo=tmp/$T.obj $< $(call tc,wcl) $(PP_FLAGS) -c -fo=tmp/$T.obj $<
$(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm $(call tc,wdis) tmp/$T.obj | $(RTRIM) > tmp/$T.obj.disasm
cc_test_all: cc_test_wc cc_test-all: cc_test_wc
endif endif
.PHONY: cc_test_all .PHONY: cc_test-all
endif # wdis endif # wdis
@ -259,7 +259,7 @@ tmp/l_test_gcc_i386.% : tc_list = arch-i086 default
tmp/l_test_gcc_i386.out: l_test.c $(L_TEST_DEPS) tmp/l_test_gcc_i386.out: l_test.c $(L_TEST_DEPS)
$(call tc,gcc) -O0 -g -o $@ $< $(call tc,gcc) -O0 -g -o $@ $<
./$@ ./$@
l_test_all: tmp/l_test_gcc_i386.out l_test-all: tmp/l_test_gcc_i386.out
ifneq ($(wildcard $(BC502DIR)/bin/bcc.exe),) ifneq ($(wildcard $(BC502DIR)/bin/bcc.exe),)
tmp/l_test_bc.% : tc_list = method-lzma arch-i086 default tmp/l_test_bc.% : tc_list = method-lzma arch-i086 default
@ -268,7 +268,7 @@ tmp/l_test_bc.exe: l_test.c $(L_TEST_DEPS)
$(call tc,bcc) -o$(subst /,\\,$@) $< $(call tc,bcc) -o$(subst /,\\,$@) $<
@rm -f l_test.o l_test.obj @rm -f l_test.o l_test.obj
cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe
##l_test_all: tmp/l_test_bc.exe ##l_test-all: tmp/l_test_bc.exe
endif endif
ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),) ifneq ($(wildcard $(DM849DIR)/bin/dmc.exe),)
@ -278,7 +278,7 @@ tmp/l_test_dm.exe: l_test.c $(L_TEST_DEPS)
$(call tc,dmc) -ml -o$(subst /,\\,$@) $< $(call tc,dmc) -ml -o$(subst /,\\,$@) $<
@rm -f l_test.o l_test.obj @rm -f l_test.o l_test.obj
cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe
l_test_all: tmp/l_test_dm.exe l_test-all: tmp/l_test_dm.exe
endif endif
ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),) ifneq ($(wildcard $(VC152DIR)/bin/cl.exe),)
@ -288,7 +288,7 @@ tmp/l_test_vc.exe: l_test.c $(L_TEST_DEPS)
$(call tc,cl) -Fe$(subst /,\\,$@) $< $(call tc,cl) -Fe$(subst /,\\,$@) $<
@rm -f l_test.o l_test.obj @rm -f l_test.o l_test.obj
cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe
l_test_all: tmp/l_test_vc.exe l_test-all: tmp/l_test_vc.exe
endif endif
ifneq ($(wildcard $(WATCOM)/binl/wcl),) ifneq ($(wildcard $(WATCOM)/binl/wcl),)
@ -298,8 +298,8 @@ tmp/l_test_wc.exe: l_test.c $(L_TEST_DEPS)
$(call tc,wcl) -fe=$@ $< $(call tc,wcl) -fe=$@ $<
@rm -f l_test.o l_test.obj @rm -f l_test.o l_test.obj
cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe cp -p $@ tmp/test.exe && $(DOSBOX) tmp/test.exe
l_test_all: tmp/l_test_wc.exe l_test-all: tmp/l_test_wc.exe
endif endif
.PHONY: l_test_all .PHONY: l_test-all

11
src/stub/src/arch/i086/cleanasm.py
View File

@ -464,6 +464,17 @@ def main(argv):
args = "%s /* %d */" % (labels[args_label][2], labels[args_label][3]) args = "%s /* %d */" % (labels[args_label][2], labels[args_label][3])
else: else:
args = labels[args_label][2] args = labels[args_label][2]
if 0:
# remove unneeded "byte/word/dword ptr"
# [this works, but disabled for now as we gain nothing]
if re.search(r"\bbyte ptr ", args):
if re.search(r"^[abcd][hl],", args): args = args.replace("byte ptr ", "")
if re.search(r",[abcd][hl]$", args): args = args.replace("byte ptr ", "")
if re.search(r"\bword ptr ", args):
if re.search(r"^[abcds][ix],", args): args = args.replace("word ptr ", "")
if re.search(r",[abcds][ix]$", args): args = args.replace("word ptr ", "")
if re.search(r"\bdword ptr ", args):
if re.search(r"^[abcd][x],", args): args = args.replace("dword ptr ", "")
l = "%8s%-7s %s" % ("", inst, args) l = "%8s%-7s %s" % ("", inst, args)
ofp.write(l.rstrip() + "\n") ofp.write(l.rstrip() + "\n")
ofp.close() ofp.close()