mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Add COMPARE and NON_MATCHING build options (#275)

Browse source 
* Add COMPARE and NON_MATCHING build options

* Add a -m/--make option to first_diff.py

* Minor comment update
This commit is contained in:
Roman971 2020-07-19 21:42:05 +02:00 committed by GitHub
parent 15038468ac
commit 3d36fe510f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile
View file

@ -1,5 +1,17 @@
.SUFFIXES: .SUFFIXES:
# Build options can either be changed by modifying the makefile, or by building with 'make SETTING=value'
# If COMPARE is 1, check the output md5sum after building
COMPARE ?= 1
# If NON_MATCHING is 1, define the NON_MATCHING C flag when building
NON_MATCHING ?= 0
ifeq ($(NON_MATCHING),1)
CFLAGS := -DNON_MATCHING
COMPARE := 0
endif
PROJECT_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) PROJECT_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
#### Tools #### #### Tools ####
@ -38,7 +50,7 @@ ASFLAGS := -march=vr4300 -32 -Iinclude
MIPS_VERSION := -mips2 MIPS_VERSION := -mips2
# we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Surpress the warnings with -woff. # we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Surpress the warnings with -woff.
CFLAGS := -G 0 -non_shared -Xfullwarn -Xcpluscomm -Iinclude -Isrc -Wab,-r4300_mul -woff 649,838 CFLAGS += -G 0 -non_shared -Xfullwarn -Xcpluscomm -Iinclude -Isrc -Wab,-r4300_mul -woff 649,838
ifeq ($(shell getconf LONG_BIT), 32) ifeq ($(shell getconf LONG_BIT), 32)
# Work around memory allocation bug in QEMU # Work around memory allocation bug in QEMU
@ -128,9 +140,11 @@ build/src/overlays/gamestates/%.o: CC := python3 tools/asm_processor/build.py $(
#### Main Targets ### #### Main Targets ###
compare: $(ROM) all: $(ROM)
ifeq ($(COMPARE),1)
@md5sum $(ROM) @md5sum $(ROM)
@md5sum -c checksum.md5 @md5sum -c checksum.md5
endif
$(ROM): $(ELF) $(ROM): $(ELF)
$(ELF2ROM) -cic 6105 $< $@ $(ELF2ROM) -cic 6105 $< $@
@ -232,4 +246,4 @@ build/src/libultra_code/llcvt.o: src/libultra_code/llcvt.c
# $(ZAP2) btex ci4 $< $@ # $(ZAP2) btex ci4 $< $@
#build/assets/%.ci8: assets/%.ci8.png #build/assets/%.ci8: assets/%.ci8.png
# $(ZAP2) btex ci8 $< $@ # $(ZAP2) btex ci8 $< $@

10
first_diff.py
View file

@ -24,10 +24,16 @@ parser.add_argument(
const="prompt", const="prompt",
help="run diff.py on the result with the provided arguments" help="run diff.py on the result with the provided arguments"
) )
parser.add_argument(
"-m", "--make", help="run make before finding difference(s)", action="store_true"
)
args = parser.parse_args() args = parser.parse_args()
diff_count = args.count diff_count = args.count
if args.make:
check_call(["make", "-j4", "COMPARE=0"])
baseimg = f"baserom.z64" baseimg = f"baserom.z64"
basemap = f"expected/build/z64.map" basemap = f"expected/build/z64.map"
@ -228,6 +234,10 @@ if diffs > 100:
print(f"No ROM shift{' (!?)' if definite_shift else ''}") print(f"No ROM shift{' (!?)' if definite_shift else ''}")
if args.diff_args: if args.diff_args:
if len(found_instr_diff) < 1:
print(f"No instruction difference to run diff.py on")
exit()
diff_sym = search_rom_address(found_instr_diff[0]).split()[0] diff_sym = search_rom_address(found_instr_diff[0]).split()[0]
if args.diff_args == "prompt": if args.diff_args == "prompt":
diff_args = input("Call diff.py with which arguments? ") or "--" diff_args = input("Call diff.py with which arguments? ") or "--"

2
src/code/z_play.c
View file

@ -1636,7 +1636,7 @@ s32 func_800C05E4(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3,
ret *= 2; ret *= 2;
ret |= Camera_SetParam(camera, 4, arg4); ret |= Camera_SetParam(camera, 4, arg4);
camera->dist = func_800CB678(arg2, arg3); camera->dist = Math3D_Vec3f_DistXYZ(arg2, arg3);
player = camera->player; player = camera->player;
if (player != NULL) { if (player != NULL) {