From 5c5a6a97b75c528cb8b9ece95666272282430b15 Mon Sep 17 00:00:00 2001 From: Zane Kaminski Date: Fri, 2 Apr 2021 02:26:34 -0400 Subject: [PATCH] Break in P24 --- Makefile | 2 +- bin/driver7M5.bin | Bin 1627 -> 1614 bytes bin/rom8M.bin | Bin 8388608 -> 8388608 bytes rdisk.c | 5 +++-- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9bded79..8b1f579 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ obj/entry_rel.sym: obj obj/entry.o obj/rdisk7M5.o: rdisk.c obj - $(CC) -Wall -DRDiskSize=7864320 -c -Os $< -o $@ + $(CC) -Wall -DRDiskSize=7864320 -march=68030 -c -Os $< -o $@ obj/rdisk7M5.s: obj obj/rdisk7M5.o $(OBJDUMP) -d obj/rdisk7M5.o > $@ diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin index 6920c07841b88154099f585bb991a322daf99abb..1436dc5487a989f60d77c8de53a3c2d55cb66f70 100755 GIT binary patch delta 463 zcmcc3bBi-je1u3a}Fo>krEYMWQW)M*ci0s$f!@$7Ip%5O?uaLpORL1JnF}Z|M znK6Cx3`TA745JJNwr!nxENYxV%?bet^9o)jF#Hdhe2Y;^z^fyjfk{p!KthW_E{%aP zZZaE_l81mkgPfNIV`&Zp!yzFH#u6q*2F8~M(jA>xMcBMp(ij--a5*q=ygXpeDC)$Z zBI?Yb>a~hNA^d>n0ndYn8qyuSEO<7hGcfF#T*YL=1a!(SCU;W?28MJFA$D)$rD&aC(mbL(>=j(g5eUw8y*J+$Mhl|2TpyE3ku#R7chAT9+Cbq@v+uZHxx$x)0_EF1nXFib9ERAwxhJd06VJjp17fo)r79*Y`hP_sfn z!kmJa2@L=JCf{L{5&|hrXJFD&36RiYkV|7=%$m%`q!c8k&miYz!C0EZz;I5;g0X~& zk%3W$`3YYEC!g7>_lGIx(n-Iy0zxtzu9JKj6{ealoU| zx!Yd5#cpMlU(@S_9IQ2oUD0rV>;-$sFoc;|+GNpY`$YM|c2f?$+M_6n{SAgXf z8E7%^cpNaOVPIdNpD<;z7;6&?$im69Sj`l{s(BV@0dv61OR94h#&v} diff --git a/bin/rom8M.bin b/bin/rom8M.bin index d253312f3f9c24f10bd90313955f64064e6f4f3c..e1e5afc9a6c91c64cfba8a4a795414c716bb22a7 100755 GIT binary patch delta 1015 zcmYk%O-vI(6bJA(Tc#9TKCG=ELc4SeND+!CP!+H(C}l;ghBb^(W4>pVxkzM9*8%C|HZ_Z$!{`mUS{5Vu~;l2rki3@!jxeu z;U#~OQIn#s^v)7nN~@#IfI!lvW1CtX;C|O1k&APQ#@?6pJ>VKVIu+~ zwiZ`?er_=;31OnuWG|W4;+4$mC#SWR@{|RV+TsoIhPO*G)vI{K=PJ>n_SMd-1oY#Q zczrn$sV1|V>?rTaB7u`&B4Vmpztc-hurW5tkahZ5Xg#W*T-sBK=dw<1S>o$PWkw}d zqrJ=Jg(<^Sv$-CSpB~ORxK&GYaAWZ@Ez^7YCVI)I4vXF-x8BFlk5HN7B7^!1yAb{< z^^%0izi4$1UTt02Og$-ekr;@VPEz8$J2a=^%iDr7qh-syLLZ@3<~ET>diwhZ=@tFn zkhPNU*-q_|%u7UneQ6bK#QVr7dhe~s9E^|%CP;#0*a9M?Kq{m`I&1|qYy%5eVLN0% zChUML*a_K?12(XO1i9b<8Jv&@`A`76pb%V81iPUaO27@Jum{RuFYJSIsDMiFz+Ou%)Rgd1@4 K&5C@hV)YO6CS|k$ delta 1018 zcmYk&O-xfk5C`ztwhN^c)Y<}8Xdi6>DM*noQ2|RqsTC3H2lz=rX%P`Bv=tHYsYKL+ z@nGDfLW2y%aU_2P($wUtX;{`boPa6Eck{Gl3ZQktcyqT;l%NkiR&c;>a z>T%69f1XqSvH7c-TB6?X6z?Q{=l_V^QlfxuHK+cpMEV|LWDchPtB}NU4v&dJ3-{|J zZGo4JJ~=cdW-Z*TdHS13ELgamMTE}Ei!!^)dMIh;cE2V+#eYL;4Ll0}2+&H4Xtr{* zLAf0wmDAChOTNLPW2{H!H7Moz5chrb;y$YYi^4 zVwhsHTE$7F#m_LpIyP0?RSw%OM_0JeReLR}x>=PA6t(ZZVU~3)3Q0 zmsoenLl4AKF3&7i4rZ}F(W2f>^`VH~o#Ikv3I7aK_?)B;{lcyaE=j#4C0=4dRM>c} z=}98_xYS8{Z@hGrk|$k(`{JgJU)Ly2h0e~a3K9kSNhgYplXlM(89i=CM@w|V-`LPM zFw{--g8r=7Mag2eL)^3Tl8HGxha^Y_Eu?@BQb7-CkPd5LEvy3rtOp~QAOkWX3pRim zHbOS!fCa1|K`z+94i3nJd?>gLXIy$KW`efRk_v zIv@a@&;_UA40J;fLeK+ep%>0UADoAN7=SQbfI%372t*+U7hxDK!3bQ2QMdwQFX!x6 HE5G~&{BUW% diff --git a/rdisk.c b/rdisk.c index 3d2c5d5..653e37d 100644 --- a/rdisk.c +++ b/rdisk.c @@ -57,6 +57,7 @@ void C24(Ptr sourcePtr, Ptr destPtr, unsigned long byteCount) { void __attribute__ ((noinline)) P24(Ptr ptr, Ptr patch) { signed char mode = true32b; SwapMMUMode(&mode); + DebugStr("\phello"); *ptr = *patch; // Patch byte SwapMMUMode(&mode); } @@ -236,8 +237,8 @@ OSErr RDCtl(CntrlParamPtr p, DCtlPtr d) { if (!c->status.diskInPlace || c->status.writeProt || !c->ramdisk) { return controlErr; } long long zero = 0; - if (*MMU32bit) { copy24(c->ramdisk, &zero, sizeof(zero)); } - else { copy24(c->ramdisk, StripAddress(&zero), sizeof(zero)); } + if (*MMU32bit) { copy24(c->ramdisk, (Ptr)(&zero), sizeof(zero)); } + else { copy24(c->ramdisk, StripAddress((Ptr)(&zero)), sizeof(zero)); } return noErr; case kVerify: if (!c->status.diskInPlace) { return controlErr; }