From 5c8eb7ba65a689e9e7f39be4dcd43fec07d854b0 Mon Sep 17 00:00:00 2001 From: beeanyew Date: Tue, 18 May 2021 19:13:26 +0200 Subject: [PATCH] Get rid of some address translation --- a314/a314device/proto_a314.h | 4 ++-- a314/software-amiga/a314eth.device | Bin 5896 -> 6560 bytes a314/software-amiga/a314fs | Bin 11760 -> 11720 bytes .../a314fs_pistorm/patch_a314fs.py | 2 +- a314/software-amiga/piaudio | Bin 12000 -> 11976 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/a314/a314device/proto_a314.h b/a314/a314device/proto_a314.h index 5167d29..e8512ef 100644 --- a/a314/a314device/proto_a314.h +++ b/a314/a314device/proto_a314.h @@ -7,7 +7,7 @@ extern struct Library *A314Base; -ULONG __TranslateAddressA314(__reg("a6") void *, __reg("a0") void *)="\tjsr\t-42(a6)"; -#define TranslateAddressA314(address) __TranslateAddressA314(A314Base, address) +//ULONG __TranslateAddressA314(__reg("a6") void *, __reg("a0") void *)="\tjsr\t-42(a6)"; +#define TranslateAddressA314(address) (ULONG)address #endif diff --git a/a314/software-amiga/a314eth.device b/a314/software-amiga/a314eth.device index 6a8fb8883cb69e4d90a88af8a4c6d4fdff72b095..1e5f0f927b7e28877d1b3c351dec6f512964bafc 100644 GIT binary patch delta 2243 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 ayn2^@N?SVuIOKlF_9`az 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 diff --git a/a314/software-amiga/a314fs_pistorm/patch_a314fs.py b/a314/software-amiga/a314fs_pistorm/patch_a314fs.py index 08d9983..5f89126 100644 --- a/a314/software-amiga/a314fs_pistorm/patch_a314fs.py +++ b/a314/software-amiga/a314fs_pistorm/patch_a314fs.py @@ -1,4 +1,4 @@ -with open('a314fs', 'r+b') as f: +with open('../a314fs', 'r+b') as f: f.seek(0x1c) b = f.read(4) f.seek(0x20) diff --git a/a314/software-amiga/piaudio b/a314/software-amiga/piaudio index 5aec55ec55ed677a2ac76dcd4ddb956b08da73e9..a50b7bb897aa487ceb7c86f1469df47570cb3e9b 100644 GIT binary patch delta 1473 zcmZuxZA=tL7@oOZxbYH@h*qJA#xzT{1X62?Ax+p5f&v|#Gh~i(P4V4Bufd8y@76Whm&2N%jWbJV9o0ZyZ(6*W}L)_qRW);#c zSzlL#D{Mt7^{yo_U#86nZ*bJH;HGl<{07CwE^qoYUw_57uC2Rlhgp^5lgbiH5k29i zhL?G!*FA8ebQwUNxOP8J51a<~0!6RntTT)>DdVp-Guw&E?G@HKvya8lNA~tLJvom` zAv9U8e4O)nIj7p>U$Uy;wv5#dW6NmXd7(-#)YZOQY78{~*4WK^tOrj8KTbZ7vurTV z<}(k#GFIfg2zRgv=bN0xtoJw{%i0fjBokR_BHY8qbGE|Qlc}74A*^7jyaSv~Wgq9L zQp|ZoDd#+^?BXoB3OMg{eF=xzeU}e9*%R0MFw8>keQ60kJnyg?wV3_r-osC9>K8o0 zsJa!FuxZr?CAOgMg3+YrxhSZnA4C9{@(b3j^f43Y&~LZa`6m0pcM_V(GW{(G$CADI z6y}YspT?~BZr|wr0Dzn9fo}(U>M!ALeamrJ9s&S{t)|1U)dT>@d5%7gevSc-A&y~= z&pAdp;v84mB&p61ua2(5M|X9o)U~~5eV^3mchEHyZVH~N{{!gcB#?AR8{Y1)Qo9pu z(eT1V(h=AXd2bGyU-A1sH=n{7TPS$@wOL0Bc~Ap7j0Vv-nnFvsorMb3o=0fdK4`xx z{e%2?THYzw%SYwT%qy7>ol)mRmXa08Y0bHucRBA@MOT8#1?7(NyQ|kV<`&)c?(fx* z+O3YNv%WIlQQsNgf-joC+u!VO_0N$S5+a94m^70JIY!z^l*C9U87EU@maG{4M%=h- zrke>{!6;iSEa<619oU8&aW}q>AIUb^?T)DFo^zf7&x~im^URy;CEl>N%RA}4uh}$3 ztI-;@cI~=0q21F`+M>4N%cYoVl+YF$rwz23_R|q#ArJ}-nA^-+Gh$vaN6Z=XvH7f^ z2J`?M{8?xbI>ZJsBsPm(YYzI5OZZ2~ZnBru7jyy} z5QGsS&Yz-?D|kRTNE1F3mc^2EkCc1N;dYEWW*kdMLi1=bbBIikY4Qu1Cy&VzO{be_ z8Lg!u+Ch8iAiY5+={-6}Q*?nY(Pbmua2kb1iBVzH7`8?-%pV^8sw0K27jLf;GNE>fr%{l4EX6;Q> zN@PBoG^uFeiEvFq;w>UX+@6y)MBXAs6A2j-GQvrWa4{-G+9nU%xzF13kN)_4?m3_D zhwqPb59jW|nS&Rz-7NqByTE$_l7K9L#PUx7l$LLc*2{2byk7pr0t;KeWv2j8dqcMX$R7$<)`1nCvXcOqFg0VziT`)rO*`dz;VRg$)y!n7Y&MnE@mh7w zbP_nqg$p>2*!UBxx_y3GrfW^Wf69zSz^;GABu1gR!=Zu2(ly{ns>jvZGJg{p2j1J91W*JS_cor$Fg2PSi#4# z_X}R5?GYT-)(bwP6$>8Kwg{fr0)jm`U&9;x#~d#t{I{GBU?UGY_rL^?I*$wGiSsK_ zxl3P{Tj~duPXRtGM?jq~?I@!@jL1hgw3P0zfVa z^a%6{^a;cSZV2=X3EgQ`m+-=Q9g&ECRZCTf|uV+8ginMy|iZ-Dw5b-=`y>7~|17B{4df_kBoWd~PLg&KC7q;;{7mkXM>Lc5vLW`X;WQGK zz#yM02y|4TF0A2t+>H}>LDkfa&Su@|>UQ`Eyp0%DrPqnAc z)9xAdjC-a%b6()h^cGMb-9$@hD;=VTXoU9C0hY{f$nP_D8)2i_xMB<#Gsa>-2~>j) zV1f6gdZ|e+m#gGjxs6BHec3UFcA#=pgN~wBbQ)bkBj`4oKo8MlT!MGv5U$0oxD%hp zF+7YX@DzT8=T%wFRQ+m!x=r1!R;gk2uzEsmS3C6@yAb*kPWRb3< zPReK*4bujChF+%E=p8yqr|B%6qe-@sIhd0Xwu6