From 32346fe5e17dab8a38d1237fe5cde013a53579d2 Mon Sep 17 00:00:00 2001 From: Larry Date: Fri, 26 May 2017 12:16:57 -0500 Subject: [PATCH] some changes, build.sh now works Former-commit-id: febd11b966cc3140c31670599fdec97a04484cca [formerly c083013cf58f1e48912c7feb0bfad6dea0381426] Former-commit-id: 1869438fe93ed738e232a177518aff4f289667a2 --- disassembly/GE007.sym.REMOVED.git-id | 2 +- disassembly/build.sh | 15 +++++++ disassembly/code/bss.inc | 40 +++++++++--------- disassembly/code/stack.inc | 40 +++++++++--------- disassembly/lib/GE007.inc | 2 +- disassembly/ob/make_text_rz.sh.REMOVED.git-id | 2 +- disassembly/ob/text.asm.REMOVED.git-id | 2 +- disassembly/ob/text/LarchE.rz.REMOVED.git-id | 2 +- disassembly/ob/text/LcradE.rz.REMOVED.git-id | 2 +- disassembly/ob/text/LdamE.rz.REMOVED.git-id | 2 +- disassembly/ob/text/LdepoE.rz | Bin 864 -> 863 bytes disassembly/ob/text/LlenE.asm | 18 -------- disassembly/ob/text/LlenE.asm.REMOVED.git-id | 1 + disassembly/ob/text/LlenE.inc | 7 --- disassembly/ob/text/LlenE.inc.REMOVED.git-id | 1 + disassembly/ob/text/LlenE.rz | Bin 5 -> 0 bytes disassembly/ob/text/LlenE.rz.REMOVED.git-id | 1 + disassembly/ob/text/LstatE.rz.REMOVED.git-id | 2 +- disassembly/ob/text/LtitleE.rz.REMOVED.git-id | 2 +- disassembly/rodata/make_rodata_rz.sh | 17 ++++++++ disassembly/rodata/rodata.asm.REMOVED.git-id | 2 +- disassembly/rodata/rodata.inc | 17 -------- disassembly/rodata/rodata.inc.REMOVED.git-id | 1 + disassembly/rodata/rodata.rz.REMOVED.git-id | 1 + disassembly/rodata/rodata.rz.asm | 6 ++- disassembly/rodata/rodata.sym.REMOVED.git-id | 1 - 26 files changed, 91 insertions(+), 95 deletions(-) create mode 100755 disassembly/build.sh delete mode 100644 disassembly/ob/text/LlenE.asm create mode 100644 disassembly/ob/text/LlenE.asm.REMOVED.git-id delete mode 100644 disassembly/ob/text/LlenE.inc create mode 100644 disassembly/ob/text/LlenE.inc.REMOVED.git-id delete mode 100644 disassembly/ob/text/LlenE.rz create mode 100644 disassembly/ob/text/LlenE.rz.REMOVED.git-id create mode 100755 disassembly/rodata/make_rodata_rz.sh delete mode 100644 disassembly/rodata/rodata.inc create mode 100644 disassembly/rodata/rodata.inc.REMOVED.git-id create mode 100644 disassembly/rodata/rodata.rz.REMOVED.git-id delete mode 100644 disassembly/rodata/rodata.sym.REMOVED.git-id diff --git a/disassembly/GE007.sym.REMOVED.git-id b/disassembly/GE007.sym.REMOVED.git-id index 06ba3ac..71f70c5 100644 --- a/disassembly/GE007.sym.REMOVED.git-id +++ b/disassembly/GE007.sym.REMOVED.git-id @@ -1 +1 @@ -e78580f2cfe0bc3d361d3e1a7b62967efb6d9c0a \ No newline at end of file +2c5242b4d473799023fbf98dcb23fd3c751f0849 \ No newline at end of file diff --git a/disassembly/build.sh b/disassembly/build.sh new file mode 100755 index 0000000..e1256ec --- /dev/null +++ b/disassembly/build.sh @@ -0,0 +1,15 @@ +#make and compress resources +cd ob +./make_text_rz.sh +cd ../ + +#build and compress rodata +cd rodata +./make_rodata_rz.sh +cd ../ + +#third package the rom +bass -sym GE007.sym GE007.rom.asm + +vbindiff ./GE007.n64 ~/n64/007\ -\ GoldenEye.z64 + diff --git a/disassembly/code/bss.inc b/disassembly/code/bss.inc index 20c9881..6095ac2 100644 --- a/disassembly/code/bss.inc +++ b/disassembly/code/bss.inc @@ -1,32 +1,32 @@ -base $8005D2E0 -seg_bss_start: +constant seg_bss_start($8005D2E0) -base $8005D2E0 -rmonthread: -base $8005D490 -idlethread: +constant rmonthread($8005D2E0) -base $8005D640 -mainthread: -base $8005D7F0 -shedthread: +constant idlethread($8005D490) -base $8005E530 -audithread: -base $80060C90 -debugthread: +constant mainthread($8005D640) -base $80068DF0 -__osBaseTimer: -base $80069170 -bss_80069170: +constant shedthread($8005D7F0) + + +constant audithread($8005E530) + + +constant debugthread($80060C90) + + +constant __osBaseTimer($80068DF0) + + +constant bss_80069170($80069170) + + +constant seg_bss_end($8008E360) -base $8008E360 -seg_bss_end: diff --git a/disassembly/code/stack.inc b/disassembly/code/stack.inc index d24cbba..102c11c 100644 --- a/disassembly/code/stack.inc +++ b/disassembly/code/stack.inc @@ -1,13 +1,10 @@ -base $80300000 -seg_sp_start: -decompression_buffer: +constant seg_sp_start($80300000) -base $803AB400 -sp_boot: +constant decompression_buffer(seg_sp_start+$0) -base $803AB3D0 -sp_init:;scope sp_init { +constant sp_init(seg_sp_start+$AB3D0) +scope sp_init { define sp_init_s0($1C) define sp_init_s1($20) define sp_init_ra($24) @@ -15,21 +12,24 @@ define rarezip_pos($28) define rodata_pos($34) } -base $803AB410 -sp_rmon: +constant sp_boot(seg_sp_start+$AB400) -base $803AB710 -sp_idle: -base $803AB750 -sp_shed: +constant sp_rmon(sp_boot+$10) //$ab410 -base $803AB950 -sp_main: -base $803B3950 -sp_audi: +constant sp_idle(sp_rmon+$300) //$ab710 -base $803B4950 -sp_unknown: -seg_sp_end: + +constant sp_shed(sp_idle+$40) //$ab750 + + +constant sp_main(sp_shed+$200) //$ab950 + + +constant sp_audi(sp_main+$8000) //$b3950 + + +constant sp_unknown(sp_audi+$1000) //$b4950 + +//seg_sp_end: diff --git a/disassembly/lib/GE007.inc b/disassembly/lib/GE007.inc index 20d6aed..1f6a5f6 100644 --- a/disassembly/lib/GE007.inc +++ b/disassembly/lib/GE007.inc @@ -3,7 +3,7 @@ variable seg_rarezip_rom_size(seg_rarezip_rom_end-seg_rarezip_rom_start) variable seg_bss_size(seg_bss_end-seg_bss_start) variable seg_tlbcode_rom_size(seg_tlbcode_rom_end-seg_tlbcode_rom_start) variable seg_rodata_rom_size(seg_rodata_rom_end-seg_rodata_rom_start) -variable seg_sp_start(seg_sp_end-seg_sp_start) +//variable seg_sp_size(seg_sp_end-seg_sp_start) macro getaddresstoregister(address, reg) { define return({reg}) //what register to return in diff --git a/disassembly/ob/make_text_rz.sh.REMOVED.git-id b/disassembly/ob/make_text_rz.sh.REMOVED.git-id index 18d8ffe..f18d83a 100644 --- a/disassembly/ob/make_text_rz.sh.REMOVED.git-id +++ b/disassembly/ob/make_text_rz.sh.REMOVED.git-id @@ -1 +1 @@ -1118032a62e1015604dac221ab3171edd4ff2d48 \ No newline at end of file +783312b367019dd06da992930d46120b44eb4168 \ No newline at end of file diff --git a/disassembly/ob/text.asm.REMOVED.git-id b/disassembly/ob/text.asm.REMOVED.git-id index 3c9e32e..3c5e448 100644 --- a/disassembly/ob/text.asm.REMOVED.git-id +++ b/disassembly/ob/text.asm.REMOVED.git-id @@ -1 +1 @@ -f83f7bb2c23e8134d4c2a7acdc7f7b86da417a25 \ No newline at end of file +f8bd8c4316f78a353ce23271c3042e200a437118 \ No newline at end of file diff --git a/disassembly/ob/text/LarchE.rz.REMOVED.git-id b/disassembly/ob/text/LarchE.rz.REMOVED.git-id index b8cfa8e..7acdd14 100644 --- a/disassembly/ob/text/LarchE.rz.REMOVED.git-id +++ b/disassembly/ob/text/LarchE.rz.REMOVED.git-id @@ -1 +1 @@ -073133a4f3bcbc763573527c561dbdd5223cbbea \ No newline at end of file +d256448e8a838b43c9a1763436440bbe88aaf295 \ No newline at end of file diff --git a/disassembly/ob/text/LcradE.rz.REMOVED.git-id b/disassembly/ob/text/LcradE.rz.REMOVED.git-id index 236b8c8..3c07767 100644 --- a/disassembly/ob/text/LcradE.rz.REMOVED.git-id +++ b/disassembly/ob/text/LcradE.rz.REMOVED.git-id @@ -1 +1 @@ -6aec55d3c77a15b0b8ae4bca0baafe8d7b615c98 \ No newline at end of file +0b1d4b440afe44ef2154ae284904771036b88590 \ No newline at end of file diff --git a/disassembly/ob/text/LdamE.rz.REMOVED.git-id b/disassembly/ob/text/LdamE.rz.REMOVED.git-id index d1ec691..df4b75f 100644 --- a/disassembly/ob/text/LdamE.rz.REMOVED.git-id +++ b/disassembly/ob/text/LdamE.rz.REMOVED.git-id @@ -1 +1 @@ -40709a7e7e94ce8a81720644ce7f33b038b24ad5 \ No newline at end of file +e791ed10859e6bb4c8bc4f6ecdffcbb24d90d93e \ No newline at end of file diff --git a/disassembly/ob/text/LdepoE.rz b/disassembly/ob/text/LdepoE.rz index d017281562db45810296436b72616a258a52fd33..d39ed0e686eecbb125cf40c8810f727179fa109b 100644 GIT binary patch delta 827 zcmV-B1H}B`2HysM)m6cc6gLocNFd960f!vwfHXNQBMyXzWXWz|qzEY&Punx? z8Mmvk-80*NkOK!kBZquQK7#`vkwXr75b(h7z#mFot(Cg=w^CmNdpCd|fZu>56W}@Ur#koB`wIZ?-Yejr z;obE;;3n`b@Eri2>xZ&4tt~y&k)$(!_aiq{+h{2xMHO9RDfPiPA)tym8W*rkFAh><|d%8u2 zspl@zOm;Ji;@GvhNP4^K3H@rv21lvYpszZwqwfbL2$!Pg!UpY~HxzA-&aO*;c@7zT zXWNLwiRK(3sA1#g4pD390l$cov|!Rc*JzD*6}KQqwV9H&s2&G;YIH9ua_z#(g@ptz zSQcPsY9pJjD&<2kp<9g8{#1(2bkxPJ;WgD7e0pUA{j9V0y_N<{BhFzR#tC%Z%^Qv@s+}?5(HkvC8@nlE<4!Xb9pyqN^rKw$f*B;WZp$>Jy2~QL z@FtYjLwhqBjgIR5vTrzyvurGE8G)JS4R!6-2$Z?2bcGkU=)t(5Wrt~hNgOfJ53nKe z0DJ#O(}yNj^H;d%Hmh zQ%AEb4NrP*X=QtPr5@Xgaf4fe}@CW$9^1Ls&U0-mQ^#yaWFD%b|;q;q%^!l4Q7|PrI3kJ`7{KLG*KllRwi2vaq z!$-X{8)yD8#l;P5!`HvEM#@lvckyjM96Jel-SC}bg=1Uj_WFqqtbZETZ#eW>VMWB& F?_b2llTQEu delta 828 zcmV-C1H=5^2H*yN)m6=o6gLny2}zcDf*d&1A=2cqj5r{XBSD);z>-~HqzH+Nr|p^c zjN8?*-81wXaL6H#kpmCHW8{#B;E+SUaxcrw?((xpiNr{sWawd*BuTo@ z7uu7KO+vKxX&?N^8j2k3U>!NS)Q}E_?DNb~b|xdG9(4|Mnu1N4cus4FGC*+i=54w` zhN{f_ zzO!w_;Y4$e5Y(`7bBCxk^nhQ)Nm?*zpKG+nyNX+oquNZ#T2zk%JvF))6}fg{<-$S& z7c2{~GqsUTSC#T1n9wc8X@4R`XFBR)*YKKZ4L-fHfqv0h`(8@}rV;0`4&#J60<`6F zfhjqUcwAtRyA`1)_xKbQ2a7{lfASEAAhH3DVsDqZ2l4Z1gOXxU*}e-cMb^gV1y ze7O%%)%3~wxe(c~rQu1>Ev;-Xuhe5(F>Y{cl(xnYCl1TUx^w46js!nMX@|g+ex%3rl!y-KCpxAh znig)UYxyo;NSKTE6MbR+fB*QxZ=dW7XRDsj<}>q!(dHsw;B&qZ-ugnmv@i6R^M(AM z`oiqveSts17nbLJ!R`8jyR0vmi+y2v>I)~|%)>X|%)wCJ?q4u?-s2zUJ^sNL_(%MJ ze+(b>&TO3e#}pSgunk}T${Hy{3EsuG{c!9gx4zhkQtlx6z)53~~ Gt>3?@#;p7R diff --git a/disassembly/ob/text/LlenE.asm b/disassembly/ob/text/LlenE.asm deleted file mode 100644 index f85c146..0000000 --- a/disassembly/ob/text/LlenE.asm +++ /dev/null @@ -1,18 +0,0 @@ -arch n64.cpu -endian msb -include "../../lib/N64.INC" -output "LlenE.bin", create - -base $00000000 -seg_LlenE_start: -seg_LlenE_header_start: - -ptr_seg_LlenE_start: - dw seg_LlenE_start - -seg_LlenE_header_end: -seg_LlenE_strings_start: - -seg_LlenE_strings_end: -seg_LlenE_end: -align(32) diff --git a/disassembly/ob/text/LlenE.asm.REMOVED.git-id b/disassembly/ob/text/LlenE.asm.REMOVED.git-id new file mode 100644 index 0000000..718854b --- /dev/null +++ b/disassembly/ob/text/LlenE.asm.REMOVED.git-id @@ -0,0 +1 @@ +47a77a21d6ee66174469f75871943ac03ae21bb3 \ No newline at end of file diff --git a/disassembly/ob/text/LlenE.inc b/disassembly/ob/text/LlenE.inc deleted file mode 100644 index 5045fc9..0000000 --- a/disassembly/ob/text/LlenE.inc +++ /dev/null @@ -1,7 +0,0 @@ -define seg_LlenE_start($00000000) -define seg_LlenE_header_start($00000000) -define ptr_seg_LlenE_start($00000000) -define seg_LlenE_header_end($00000004) -define seg_LlenE_strings_start($00000004) -define seg_LlenE_strings_end($00000004) -define seg_LlenE_end($00000004) diff --git a/disassembly/ob/text/LlenE.inc.REMOVED.git-id b/disassembly/ob/text/LlenE.inc.REMOVED.git-id new file mode 100644 index 0000000..8e48fde --- /dev/null +++ b/disassembly/ob/text/LlenE.inc.REMOVED.git-id @@ -0,0 +1 @@ +bb4cf31ccf3c2777a5cffacf4e2e74a374605c23 \ No newline at end of file diff --git a/disassembly/ob/text/LlenE.rz b/disassembly/ob/text/LlenE.rz deleted file mode 100644 index 79334bf3d4818789fc9dd19f307ae297898ce1f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5 McmYdJIKa;U00q(klK=n! diff --git a/disassembly/ob/text/LlenE.rz.REMOVED.git-id b/disassembly/ob/text/LlenE.rz.REMOVED.git-id new file mode 100644 index 0000000..3bd21d4 --- /dev/null +++ b/disassembly/ob/text/LlenE.rz.REMOVED.git-id @@ -0,0 +1 @@ +6fc2350a53ad73ce83c8da45282d4e08dfba09de \ No newline at end of file diff --git a/disassembly/ob/text/LstatE.rz.REMOVED.git-id b/disassembly/ob/text/LstatE.rz.REMOVED.git-id index 760034d..15917c1 100644 --- a/disassembly/ob/text/LstatE.rz.REMOVED.git-id +++ b/disassembly/ob/text/LstatE.rz.REMOVED.git-id @@ -1 +1 @@ -334236f29495da92dbd467831e60b5939882211b \ No newline at end of file +427767d34d1aea72c5adc54c9314094ed254fbc3 \ No newline at end of file diff --git a/disassembly/ob/text/LtitleE.rz.REMOVED.git-id b/disassembly/ob/text/LtitleE.rz.REMOVED.git-id index 0fcd460..30e19aa 100644 --- a/disassembly/ob/text/LtitleE.rz.REMOVED.git-id +++ b/disassembly/ob/text/LtitleE.rz.REMOVED.git-id @@ -1 +1 @@ -e1de06d2c23b736d5848505b34e73f2365a79508 \ No newline at end of file +af93cc4fcb2e09df2a225bec4e081cb18c41eb2b \ No newline at end of file diff --git a/disassembly/rodata/make_rodata_rz.sh b/disassembly/rodata/make_rodata_rz.sh new file mode 100755 index 0000000..4383cbc --- /dev/null +++ b/disassembly/rodata/make_rodata_rz.sh @@ -0,0 +1,17 @@ +bass -sym rodata.sym rodata.asm +cat rodata.bin| gzip --no-name --best | tail --bytes=+11 | head --bytes=-8 > rodata.rz +#vbindiff rodata.rz 021990.rz +rm rodata.inc + +#declare -i LINENUM=1 +while read CURRENTLINE ; do + #let "LINENUM += 1" + OFFSET=$(echo "$CURRENTLINE" | cut -d " " -f1) + NAME=$(echo "$CURRENTLINE" | cut -d " " -f2) + echo "constant "$NAME"($"$OFFSET")" >> rodata.inc +done <"rodata.sym" + +#echo "include \"rodata.inc\"" >>$DIRNAME.inc + +rm rodata.sym +#rm rodata.bin diff --git a/disassembly/rodata/rodata.asm.REMOVED.git-id b/disassembly/rodata/rodata.asm.REMOVED.git-id index 55100dd..eb09933 100644 --- a/disassembly/rodata/rodata.asm.REMOVED.git-id +++ b/disassembly/rodata/rodata.asm.REMOVED.git-id @@ -1 +1 @@ -fb3e3bb061531bbdc6920121530b0a4d8cd6b944 \ No newline at end of file +8db41d4484cb4eb126e9932cf383f1013358f035 \ No newline at end of file diff --git a/disassembly/rodata/rodata.inc b/disassembly/rodata/rodata.inc deleted file mode 100644 index dc1bcc0..0000000 --- a/disassembly/rodata/rodata.inc +++ /dev/null @@ -1,17 +0,0 @@ -base $80020D90 -seg_rodata_vaddr_start: - -base $80020D90 -rspcode_start: - -base $8002303C -rspcode_end: - -base $80023044 -rodata_80023044: - -base $80023048 -cart_hw_address: - -base $8005D2E0 -seg_rodata_vaddr_end: diff --git a/disassembly/rodata/rodata.inc.REMOVED.git-id b/disassembly/rodata/rodata.inc.REMOVED.git-id new file mode 100644 index 0000000..ddc6498 --- /dev/null +++ b/disassembly/rodata/rodata.inc.REMOVED.git-id @@ -0,0 +1 @@ +a94969199bab6872f5006abc9d4045336d420985 \ No newline at end of file diff --git a/disassembly/rodata/rodata.rz.REMOVED.git-id b/disassembly/rodata/rodata.rz.REMOVED.git-id new file mode 100644 index 0000000..c15f5c2 --- /dev/null +++ b/disassembly/rodata/rodata.rz.REMOVED.git-id @@ -0,0 +1 @@ +8dbdb4503e9ecca4e06acdc0ca5b93dd8e30ef39 \ No newline at end of file diff --git a/disassembly/rodata/rodata.rz.asm b/disassembly/rodata/rodata.rz.asm index f3278b8..398fbbb 100644 --- a/disassembly/rodata/rodata.rz.asm +++ b/disassembly/rodata/rodata.rz.asm @@ -2,9 +2,11 @@ base origin() seg_rodata_rom_start: include "rodata.inc" -insert rodata_rz, "021990.rz" +//insert rodata_rz, "021990.rz" +dh $1172;insert rodata_rz, "rodata.rz" -insert padding,"pad_to_33590" +align(0x33590) +//insert padding,"pad_to_33590" base origin() seg_rodata_rom_end: diff --git a/disassembly/rodata/rodata.sym.REMOVED.git-id b/disassembly/rodata/rodata.sym.REMOVED.git-id deleted file mode 100644 index 3924d8d..0000000 --- a/disassembly/rodata/rodata.sym.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -b85e7abd8cbd1051e8bd1ed37346d455b4cddb28 \ No newline at end of file