Edit patches less aggressively

The automated changes to the output of git-format-patch looked okay, but
they were swallowing up binary changes. Now they are more conservative
and hopefully more robust. As an exception, hashes are still removed for
non-binary diffs.

For debugging, `scripts/flatten` now has a `--raw` option to skip this
post-processing step.

Soon I should try to stabilise the patch format.
This commit is contained in:
Elliot Nunn 2019-04-05 21:39:03 +08:00
parent 67f1949577
commit 9654c22756
13 changed files with 9031 additions and 414 deletions

View File

@ -20,6 +20,7 @@ parser = argparse.ArgumentParser(description='''
parser.add_argument('worktree', metavar='WORKTREE', nargs='?', action='store', default=getcwd(), type=lambda x: folder('worktree', x), help='Worktree (default is cwd, or assumed in ../worktree/)') parser.add_argument('worktree', metavar='WORKTREE', nargs='?', action='store', default=getcwd(), type=lambda x: folder('worktree', x), help='Worktree (default is cwd, or assumed in ../worktree/)')
parser.add_argument('patchset', metavar='PATCHSET', action='store', type=lambda x: folder('patchset', x), help='Destination patchset (assumed in ../patchset/)') parser.add_argument('patchset', metavar='PATCHSET', action='store', type=lambda x: folder('patchset', x), help='Destination patchset (assumed in ../patchset/)')
parser.add_argument('--raw', action='store_true', help='Do not neaten up commits')
args = parser.parse_args() args = parser.parse_args()
@ -41,6 +42,7 @@ for do_delete in listdir(args.patchset):
run(['git', 'format-patch', '-o', args.patchset, '--anchored=;', 'master-patchset-base'], stdout=DEVNULL, cwd=args.worktree, check=True) run(['git', 'format-patch', '-o', args.patchset, '--anchored=;', 'master-patchset-base'], stdout=DEVNULL, cwd=args.worktree, check=True)
if args.raw: exit()
# Edit the patches to look a bit better (and be more reproducible) # Edit the patches to look a bit better (and be more reproducible)
patchnames = [x for x in sorted(listdir(args.patchset)) if path.splitext(x)[1].lower() == '.patch'] patchnames = [x for x in sorted(listdir(args.patchset)) if path.splitext(x)[1].lower() == '.patch']
@ -72,19 +74,20 @@ for do_edit in patchnames:
o.write(msg_line) o.write(msg_line)
if msg_line == '---\n': break if msg_line == '---\n': break
for stat_line in i: for junk_line in i:
if stat_line.startswith('---'): if junk_line == junk_line.lstrip():
o.write(stat_line) o.write(junk_line)
break break
is_separated = False
for diff_line in i: for diff_line in i:
if diff_line[0].isalpha(): if diff_line.startswith('index'): # strip this hash line if possible
if not is_separated: o.write('\n') next_line = next(i)
is_separated = True if next_line.startswith('GIT binary patch'):
o.write(diff_line)
o.write(next_line)
else:
o.write(next_line)
else: else:
o.write(diff_line) o.write(diff_line)
is_separated = False
remove(fake_file) remove(fake_file)

View File

@ -5,154 +5,183 @@ Generally in line with my tolerance of theoretical impurity. Some
"header" files had their name changed, and this allows them to be "header" files had their name changed, and this allows them to be
accessed using the old name. accessed using the old name.
--- ---
diff --git a/Interfaces/AIncludes/ATalkEqu.a b/Interfaces/AIncludes/ATalkEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/ATalkEqu.a +++ b/Interfaces/AIncludes/ATalkEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'AppleTalk.a' + INCLUDE 'AppleTalk.a'
diff --git a/Interfaces/AIncludes/ATalkEqu.a.idump b/Interfaces/AIncludes/ATalkEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/ATalkEqu.a.idump +++ b/Interfaces/AIncludes/ATalkEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/PackMacs.a b/Interfaces/AIncludes/PackMacs.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/PackMacs.a +++ b/Interfaces/AIncludes/PackMacs.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'Packages.a' + INCLUDE 'Packages.a'
diff --git a/Interfaces/AIncludes/PackMacs.a.idump b/Interfaces/AIncludes/PackMacs.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/PackMacs.a.idump +++ b/Interfaces/AIncludes/PackMacs.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/PaletteEqu.a b/Interfaces/AIncludes/PaletteEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/PaletteEqu.a +++ b/Interfaces/AIncludes/PaletteEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'Palettes.a' + INCLUDE 'Palettes.a'
diff --git a/Interfaces/AIncludes/PaletteEqu.a.idump b/Interfaces/AIncludes/PaletteEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/PaletteEqu.a.idump +++ b/Interfaces/AIncludes/PaletteEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/PrEqu.a b/Interfaces/AIncludes/PrEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/PrEqu.a +++ b/Interfaces/AIncludes/PrEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'Printing.a' + INCLUDE 'Printing.a'
diff --git a/Interfaces/AIncludes/PrEqu.a.idump b/Interfaces/AIncludes/PrEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/PrEqu.a.idump +++ b/Interfaces/AIncludes/PrEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/PrintCallsEqu.a b/Interfaces/AIncludes/PrintCallsEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/PrintCallsEqu.a +++ b/Interfaces/AIncludes/PrintCallsEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'PrintTrapsEqu.a' + INCLUDE 'PrintTrapsEqu.a'
diff --git a/Interfaces/AIncludes/PrintCallsEqu.a.idump b/Interfaces/AIncludes/PrintCallsEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/PrintCallsEqu.a.idump +++ b/Interfaces/AIncludes/PrintCallsEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/QDOffscreenEqu.a b/Interfaces/AIncludes/QDOffscreenEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/QDOffscreenEqu.a +++ b/Interfaces/AIncludes/QDOffscreenEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'QDOffscreen.a' + INCLUDE 'QDOffscreen.a'
diff --git a/Interfaces/AIncludes/QDOffscreenEqu.a.idump b/Interfaces/AIncludes/QDOffscreenEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/QDOffscreenEqu.a.idump +++ b/Interfaces/AIncludes/QDOffscreenEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/QuickEqu.a b/Interfaces/AIncludes/QuickEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/QuickEqu.a +++ b/Interfaces/AIncludes/QuickEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'QuickDraw.a' + INCLUDE 'QuickDraw.a'
diff --git a/Interfaces/AIncludes/QuickEqu.a.idump b/Interfaces/AIncludes/QuickEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/QuickEqu.a.idump +++ b/Interfaces/AIncludes/QuickEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/SCSIEqu.a b/Interfaces/AIncludes/SCSIEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/SCSIEqu.a +++ b/Interfaces/AIncludes/SCSIEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'SCSI.a' + INCLUDE 'SCSI.a'
diff --git a/Interfaces/AIncludes/SCSIEqu.a.idump b/Interfaces/AIncludes/SCSIEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/SCSIEqu.a.idump +++ b/Interfaces/AIncludes/SCSIEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/ScriptEqu.a b/Interfaces/AIncludes/ScriptEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/ScriptEqu.a +++ b/Interfaces/AIncludes/ScriptEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'Script.a' + INCLUDE 'Script.a'
diff --git a/Interfaces/AIncludes/ScriptEqu.a.idump b/Interfaces/AIncludes/ScriptEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/ScriptEqu.a.idump +++ b/Interfaces/AIncludes/ScriptEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/ShutDownEqu.a b/Interfaces/AIncludes/ShutDownEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/ShutDownEqu.a +++ b/Interfaces/AIncludes/ShutDownEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'ShutDown.a' + INCLUDE 'ShutDown.a'
diff --git a/Interfaces/AIncludes/ShutDownEqu.a.idump b/Interfaces/AIncludes/ShutDownEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/ShutDownEqu.a.idump +++ b/Interfaces/AIncludes/ShutDownEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/SlotEqu.a b/Interfaces/AIncludes/SlotEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/SlotEqu.a +++ b/Interfaces/AIncludes/SlotEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'Slots.a' + INCLUDE 'Slots.a'
diff --git a/Interfaces/AIncludes/SlotEqu.a.idump b/Interfaces/AIncludes/SlotEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/SlotEqu.a.idump +++ b/Interfaces/AIncludes/SlotEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/ToolEqu.a b/Interfaces/AIncludes/ToolEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/ToolEqu.a +++ b/Interfaces/AIncludes/ToolEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'ToolUtils.a' + INCLUDE 'ToolUtils.a'
diff --git a/Interfaces/AIncludes/ToolEqu.a.idump b/Interfaces/AIncludes/ToolEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/ToolEqu.a.idump +++ b/Interfaces/AIncludes/ToolEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Interfaces/AIncludes/VideoEqu.a b/Interfaces/AIncludes/VideoEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/VideoEqu.a +++ b/Interfaces/AIncludes/VideoEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'Video.a' + INCLUDE 'Video.a'
diff --git a/Interfaces/AIncludes/VideoEqu.a.idump b/Interfaces/AIncludes/VideoEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/AIncludes/VideoEqu.a.idump +++ b/Interfaces/AIncludes/VideoEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Internal/Asm/DecompressorPatchEqu.a b/Internal/Asm/DecompressorPatchEqu.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Internal/Asm/DecompressorPatchEqu.a +++ b/Internal/Asm/DecompressorPatchEqu.a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ INCLUDE 'Decompression.a' + INCLUDE 'Decompression.a'
diff --git a/Internal/Asm/DecompressorPatchEqu.a.idump b/Internal/Asm/DecompressorPatchEqu.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Internal/Asm/DecompressorPatchEqu.a.idump +++ b/Internal/Asm/DecompressorPatchEqu.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@

View File

@ -3,6 +3,7 @@ Subject: Build system
Non-source-code changes. Mixed bag. No plans to separate these out. Non-source-code changes. Mixed bag. No plans to separate these out.
--- ---
diff --git a/DeclData/DeclData.make b/DeclData/DeclData.make
--- a/DeclData/DeclData.make --- a/DeclData/DeclData.make
+++ b/DeclData/DeclData.make +++ b/DeclData/DeclData.make
@@ -59,8 +59,8 @@ DeclHeaders = "{ObjDir}StandardEqu.d" ∂ @@ -59,8 +59,8 @@ DeclHeaders = "{ObjDir}StandardEqu.d" ∂
@ -16,7 +17,7 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
"{RsrcDir}DeclData.rsrc" ƒ "{RIncludes}Types.r" ∂ "{RsrcDir}DeclData.rsrc" ƒ "{RIncludes}Types.r" ∂
diff --git a/Drivers/Drivers.make b/Drivers/Drivers.make
--- a/Drivers/Drivers.make --- a/Drivers/Drivers.make
+++ b/Drivers/Drivers.make +++ b/Drivers/Drivers.make
@@ -22,9 +22,6 @@ BackLightDir = {DriverDir}BackLight: @@ -22,9 +22,6 @@ BackLightDir = {DriverDir}BackLight:
@ -29,7 +30,7 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
#include {NewAgeDir}NewAge.make #include {NewAgeDir}NewAge.make
#include {IOPDir}IOP.make #include {IOPDir}IOP.make
diff --git a/Make/Build b/Make/Build
--- a/Make/Build --- a/Make/Build
+++ b/Make/Build +++ b/Make/Build
@@ -108,6 +108,10 @@ @@ -108,6 +108,10 @@
@ -56,7 +57,8 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
Else Else
Alert "Error: Unknown build “{Build}”" Alert "Error: Unknown build “{Build}”"
Exit 1 Exit 1
diff --git a/Make/System.make b/Make/System.make
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Make/System.make +++ b/Make/System.make
@@ -0,0 +1,1518 @@ @@ -0,0 +1,1518 @@
@ -1578,13 +1580,14 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
+ Set RealObjDir "{ObjDir}"; Set ObjDir "{RsrcDir}" + Set RealObjDir "{ObjDir}"; Set ObjDir "{RsrcDir}"
+ Rez {StdROpts} -d VidExtVers=∂"ello∂" -d LIntVers=0x07,0x10,final,0 -d LangInt=verUS "{ResourceDir}Sys.r" -o {Targ} + Rez {StdROpts} -d VidExtVers=∂"ello∂" -d LIntVers=0x07,0x10,final,0 -d LangInt=verUS "{ResourceDir}Sys.r" -o {Targ}
+ Set ObjDir "{RealObjDir}" + Set ObjDir "{RealObjDir}"
diff --git a/Make/System.make.idump b/Make/System.make.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Make/System.make.idump +++ b/Make/System.make.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/OS/HFS/HFS.make b/OS/HFS/HFS.make
--- a/OS/HFS/HFS.make --- a/OS/HFS/HFS.make
+++ b/OS/HFS/HFS.make +++ b/OS/HFS/HFS.make
@@ -207,6 +207,10 @@ HFSObjs = "{LibDir}BTreeMgr.lib" ∂ @@ -207,6 +207,10 @@ HFSObjs = "{LibDir}BTreeMgr.lib" ∂
@ -1598,7 +1601,7 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
"{ObjDir}DiskCache.a.o" ƒ "{HFSCacheDir}DiskCache.a" ∂ "{ObjDir}DiskCache.a.o" ƒ "{HFSCacheDir}DiskCache.a" ∂
"{ObjDir}StandardEqu.d" ∂ "{ObjDir}StandardEqu.d" ∂
"{IntAIncludes}DiskCachePriv.a" ∂ "{IntAIncludes}DiskCachePriv.a" ∂
diff --git a/OS/MemoryMgr/MemoryMgr.make b/OS/MemoryMgr/MemoryMgr.make
--- a/OS/MemoryMgr/MemoryMgr.make --- a/OS/MemoryMgr/MemoryMgr.make
+++ b/OS/MemoryMgr/MemoryMgr.make +++ b/OS/MemoryMgr/MemoryMgr.make
@@ -17,15 +17,15 @@ @@ -17,15 +17,15 @@
@ -1620,7 +1623,7 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
"{LibDir}MemoryMgr.lib" ƒ "{LibDir}Figment.lib" {MemoryMgrObjs} "{LibDir}MemoryMgr.lib" ƒ "{LibDir}Figment.lib" {MemoryMgrObjs}
If "{FeatureSet}" =~ /≈'hasNewHeapMgr=True'≈/ If "{FeatureSet}" =~ /≈'hasNewHeapMgr=True'≈/
Lib {StdLibOpts} -o "{Targ}" "{LibDir}Figment.lib" {MemoryMgrObjs} Lib {StdLibOpts} -o "{Targ}" "{LibDir}Figment.lib" {MemoryMgrObjs}
diff --git a/OS/OS.make b/OS/OS.make
--- a/OS/OS.make --- a/OS/OS.make
+++ b/OS/OS.make +++ b/OS/OS.make
@@ -67,14 +67,12 @@ RealTimeDir = {OSDir}RealTime: @@ -67,14 +67,12 @@ RealTimeDir = {OSDir}RealTime:
@ -1638,7 +1641,7 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
OSObjs = "{ObjDir}clock.a.o" ∂ OSObjs = "{ObjDir}clock.a.o" ∂
diff --git a/OS/StartMgr/StartMgr.make b/OS/StartMgr/StartMgr.make
--- a/OS/StartMgr/StartMgr.make --- a/OS/StartMgr/StartMgr.make
+++ b/OS/StartMgr/StartMgr.make +++ b/OS/StartMgr/StartMgr.make
@@ -108,9 +108,7 @@ Boot3Objects = "{ObjDir}Boot3.a.o" ∂ @@ -108,9 +108,7 @@ Boot3Objects = "{ObjDir}Boot3.a.o" ∂
@ -1661,7 +1664,7 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
"{ObjDir}DispatchPatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ "{ObjDir}DispatchPatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂
diff --git a/OS/TimeMgr/TimeMgr.make b/OS/TimeMgr/TimeMgr.make
--- a/OS/TimeMgr/TimeMgr.make --- a/OS/TimeMgr/TimeMgr.make
+++ b/OS/TimeMgr/TimeMgr.make +++ b/OS/TimeMgr/TimeMgr.make
@@ -23,9 +23,3 @@ TimeMgrObjs = "{ObjDir}TimeMgr.a.o" ∂ @@ -23,9 +23,3 @@ TimeMgrObjs = "{ObjDir}TimeMgr.a.o" ∂
@ -1674,7 +1677,7 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
- "{TimeMgrDir}TimeMgrPatch.a" - "{TimeMgrDir}TimeMgrPatch.a"
- Asm {StdAOpts} -o "{Targ}" "{TimeMgrDir}TimeMgrPatch.a" - Asm {StdAOpts} -o "{Targ}" "{TimeMgrDir}TimeMgrPatch.a"
- -
diff --git a/QuickDraw/PictUtilities/PictUtilities.make b/QuickDraw/PictUtilities/PictUtilities.make
--- a/QuickDraw/PictUtilities/PictUtilities.make --- a/QuickDraw/PictUtilities/PictUtilities.make
+++ b/QuickDraw/PictUtilities/PictUtilities.make +++ b/QuickDraw/PictUtilities/PictUtilities.make
@@ -24,7 +24,7 @@ PictUtilObjs = "{ObjDir}puDispatch.a.o" ∂ @@ -24,7 +24,7 @@ PictUtilObjs = "{ObjDir}puDispatch.a.o" ∂
@ -1686,7 +1689,7 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
"{LibDir}PictUtilities.lib" ƒ "{ObjDir}puPackEntry.a.o" "{LibDir}PictUtilities.lib" ƒ "{ObjDir}puPackEntry.a.o"
diff --git a/Toolbox/HelpMgr/HelpMgr.make b/Toolbox/HelpMgr/HelpMgr.make
--- a/Toolbox/HelpMgr/HelpMgr.make --- a/Toolbox/HelpMgr/HelpMgr.make
+++ b/Toolbox/HelpMgr/HelpMgr.make +++ b/Toolbox/HelpMgr/HelpMgr.make
@@ -17,7 +17,8 @@ @@ -17,7 +17,8 @@
@ -1699,7 +1702,8 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
BalloonWDEFObjs = "{ObjDir}BalloonWDEF.a.o" ∂ BalloonWDEFObjs = "{ObjDir}BalloonWDEF.a.o" ∂
diff --git a/Toolbox/Toolbox.make b/Toolbox/Toolbox.make
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Toolbox/Toolbox.make +++ b/Toolbox/Toolbox.make
@@ -0,0 +1,152 @@ @@ -0,0 +1,152 @@
@ -1855,13 +1859,15 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
+ "{CIncludes}Disks.h" ∂ + "{CIncludes}Disks.h" ∂
+ "{DiskInitDir}DiskInitBadBlock.c" + "{DiskInitDir}DiskInitBadBlock.c"
+ C {StdCOpts} -o {Targ} "{DiskInitDir}DiskInitBadBlock.c" + C {StdCOpts} -o {Targ} "{DiskInitDir}DiskInitBadBlock.c"
diff --git a/Toolbox/Toolbox.make.idump b/Toolbox/Toolbox.make.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Toolbox/Toolbox.make.idump +++ b/Toolbox/Toolbox.make.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Tools/CODE2scod b/Tools/CODE2scod
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/CODE2scod +++ b/Tools/CODE2scod
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
@ -1896,19 +1902,22 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
+ +
+DeRez -skip scod "{Bin}" | StreamEdit -s "{Script}" -e '/•data/ Rep /∂"≈∂", / ""' > "{Txt}" +DeRez -skip scod "{Bin}" | StreamEdit -s "{Script}" -e '/•data/ Rep /∂"≈∂", / ""' > "{Txt}"
+Rez "{Txt}" -o "{Bin}" +Rez "{Txt}" -o "{Bin}"
diff --git a/Tools/CODE2scod.idump b/Tools/CODE2scod.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/CODE2scod.idump +++ b/Tools/CODE2scod.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Tools/Make.idump b/Tools/Make.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/Make.idump +++ b/Tools/Make.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+MPSTMPS +MPSTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Tools/Make.rdump b/Tools/Make.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/Make.rdump +++ b/Tools/Make.rdump
@@ -0,0 +1,8481 @@ @@ -0,0 +1,8481 @@
@ -10393,13 +10402,15 @@ Non-source-code changes. Mixed bag. No plans to separate these out.
+ $"0000 0000 0000 0000" /* ........ */ + $"0000 0000 0000 0000" /* ........ */
+}; +};
+ +
diff --git a/Tools/Pascal.idump b/Tools/Pascal.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/Pascal.idump +++ b/Tools/Pascal.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+MPSTMPS +MPSTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Tools/Pascal.rdump b/Tools/Pascal.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/Pascal.rdump +++ b/Tools/Pascal.rdump
@@ -0,0 +1,20702 @@ @@ -0,0 +1,20702 @@

View File

@ -4,6 +4,8 @@ Subject: Amphibian DNA
The BuildCubeE mechanism for short-circuiting the makefile system to The BuildCubeE mechanism for short-circuiting the makefile system to
point to prebuilt binary code. This might rate a change! point to prebuilt binary code. This might rate a change!
--- ---
diff --git a/AmphibianDNA/AppleEventMgr.rsrc.rdump b/AmphibianDNA/AppleEventMgr.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/AppleEventMgr.rsrc.rdump +++ b/AmphibianDNA/AppleEventMgr.rsrc.rdump
@@ -0,0 +1,1480 @@ @@ -0,0 +1,1480 @@
@ -1487,7 +1489,8 @@ point to prebuilt binary code. This might rate a change!
+ $"2F09 486E FFE2 2F01 6100 FF90 4E5E 4E75" /* /.Hn../.a...N^Nu */ + $"2F09 486E FFE2 2F01 6100 FF90 4E5E 4E75" /* /.Hn../.a...N^Nu */
+}; +};
+ +
diff --git a/AmphibianDNA/MACE3.c.rsrc.rdump b/AmphibianDNA/MACE3.c.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/MACE3.c.rsrc.rdump +++ b/AmphibianDNA/MACE3.c.rsrc.rdump
@@ -0,0 +1,123 @@ @@ -0,0 +1,123 @@
@ -1614,7 +1617,8 @@ point to prebuilt binary code. This might rate a change!
+ $"4E75" /* Nu */ + $"4E75" /* Nu */
+}; +};
+ +
diff --git a/AmphibianDNA/MACE6.c.rsrc.rdump b/AmphibianDNA/MACE6.c.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/MACE6.c.rsrc.rdump +++ b/AmphibianDNA/MACE6.c.rsrc.rdump
@@ -0,0 +1,118 @@ @@ -0,0 +1,118 @@
@ -1736,7 +1740,8 @@ point to prebuilt binary code. This might rate a change!
+ $"001C 4E75" /* ..Nu */ + $"001C 4E75" /* ..Nu */
+}; +};
+ +
diff --git a/AmphibianDNA/Meter.c.rsrc.rdump b/AmphibianDNA/Meter.c.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/Meter.c.rsrc.rdump +++ b/AmphibianDNA/Meter.c.rsrc.rdump
@@ -0,0 +1,73 @@ @@ -0,0 +1,73 @@
@ -1813,7 +1818,8 @@ point to prebuilt binary code. This might rate a change!
+ $"001C 4E75" /* ..Nu */ + $"001C 4E75" /* ..Nu */
+}; +};
+ +
diff --git a/AmphibianDNA/Note.c.rsrc.rdump b/AmphibianDNA/Note.c.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/Note.c.rsrc.rdump +++ b/AmphibianDNA/Note.c.rsrc.rdump
@@ -0,0 +1,94 @@ @@ -0,0 +1,94 @@
@ -1911,7 +1917,8 @@ point to prebuilt binary code. This might rate a change!
+ $"7D7E 7E7E 7E7E 7F7F 7F7F 7F7F 7F7F 7F00" /* }~~~~~.......... */ + $"7D7E 7E7E 7E7E 7F7F 7F7F 7F7F 7F7F 7F00" /* }~~~~~.......... */
+}; +};
+ +
diff --git a/AmphibianDNA/PartySamp.c.rsrc.rdump b/AmphibianDNA/PartySamp.c.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/PartySamp.c.rsrc.rdump +++ b/AmphibianDNA/PartySamp.c.rsrc.rdump
@@ -0,0 +1,942 @@ @@ -0,0 +1,942 @@
@ -2857,7 +2864,8 @@ point to prebuilt binary code. This might rate a change!
+ $"6606 A055 2E80 4ED1 C0B8 031A 2E80 4ED1" /* f..U..N.......N. */ + $"6606 A055 2E80 4ED1 C0B8 031A 2E80 4ED1" /* f..U..N.......N. */
+}; +};
+ +
diff --git a/AmphibianDNA/SinDrvr.a.rsrc.rdump b/AmphibianDNA/SinDrvr.a.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/SinDrvr.a.rsrc.rdump +++ b/AmphibianDNA/SinDrvr.a.rsrc.rdump
@@ -0,0 +1,239 @@ @@ -0,0 +1,239 @@
@ -3100,7 +3108,8 @@ point to prebuilt binary code. This might rate a change!
+ $"4E5E 4E75" /* N^Nu */ + $"4E5E 4E75" /* N^Nu */
+}; +};
+ +
diff --git a/AmphibianDNA/SinHighLevel.rsrc.rdump b/AmphibianDNA/SinHighLevel.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/SinHighLevel.rsrc.rdump +++ b/AmphibianDNA/SinHighLevel.rsrc.rdump
@@ -0,0 +1,274 @@ @@ -0,0 +1,274 @@
@ -3378,7 +3387,8 @@ point to prebuilt binary code. This might rate a change!
+ $"0000 0009 000C 002D 0079 C002 BF73" /* .......-.y...s */ + $"0000 0009 000C 002D 0079 C002 BF73" /* .......-.y...s */
+}; +};
+ +
diff --git a/AmphibianDNA/SnthLoading.rsrc.rdump b/AmphibianDNA/SnthLoading.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/SnthLoading.rsrc.rdump +++ b/AmphibianDNA/SnthLoading.rsrc.rdump
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
@ -3447,7 +3457,8 @@ point to prebuilt binary code. This might rate a change!
+ $"0000 4D41 4336" /* ..MAC6 */ + $"0000 4D41 4336" /* ..MAC6 */
+}; +};
+ +
diff --git a/AmphibianDNA/SoundInputProc.rsrc.rdump b/AmphibianDNA/SoundInputProc.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/SoundInputProc.rsrc.rdump +++ b/AmphibianDNA/SoundInputProc.rsrc.rdump
@@ -0,0 +1,724 @@ @@ -0,0 +1,724 @@
@ -4175,7 +4186,8 @@ point to prebuilt binary code. This might rate a change!
+ $"9083 5201 51CC FFF0 4CDF 001C 4E75" /* ..R.Q...L...Nu */ + $"9083 5201 51CC FFF0 4CDF 001C 4E75" /* ..R.Q...L...Nu */
+}; +};
+ +
diff --git a/AmphibianDNA/SoundPFDProc.rsrc.rdump b/AmphibianDNA/SoundPFDProc.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/SoundPFDProc.rsrc.rdump +++ b/AmphibianDNA/SoundPFDProc.rsrc.rdump
@@ -0,0 +1,481 @@ @@ -0,0 +1,481 @@
@ -4660,7 +4672,8 @@ point to prebuilt binary code. This might rate a change!
+ $"2010 7210 60E4" /* .r.`. */ + $"2010 7210 60E4" /* .r.`. */
+}; +};
+ +
diff --git a/AmphibianDNA/Wave.c.rsrc.rdump b/AmphibianDNA/Wave.c.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/Wave.c.rsrc.rdump +++ b/AmphibianDNA/Wave.c.rsrc.rdump
@@ -0,0 +1,106 @@ @@ -0,0 +1,106 @@
@ -4770,7 +4783,8 @@ point to prebuilt binary code. This might rate a change!
+ $"F81D 78D0 DF9C" /* ..x... */ + $"F81D 78D0 DF9C" /* ..x... */
+}; +};
+ +
diff --git a/AmphibianDNA/mNote.c.rsrc.rdump b/AmphibianDNA/mNote.c.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/mNote.c.rsrc.rdump +++ b/AmphibianDNA/mNote.c.rsrc.rdump
@@ -0,0 +1,129 @@ @@ -0,0 +1,129 @@
@ -4903,7 +4917,8 @@ point to prebuilt binary code. This might rate a change!
+ $"0010 51C9 FFF2 0188 0000 4CDF 0103 4E75" /* ..Q.......L...Nu */ + $"0010 51C9 FFF2 0188 0000 4CDF 0103 4E75" /* ..Q.......L...Nu */
+}; +};
+ +
diff --git a/AmphibianDNA/mSamp.c.rsrc.rdump b/AmphibianDNA/mSamp.c.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/mSamp.c.rsrc.rdump +++ b/AmphibianDNA/mSamp.c.rsrc.rdump
@@ -0,0 +1,322 @@ @@ -0,0 +1,322 @@
@ -5229,7 +5244,8 @@ point to prebuilt binary code. This might rate a change!
+ $"6606 A055 2E80 4ED1 C0B8 031A 2E80 4ED1" /* f..U..N.......N. */ + $"6606 A055 2E80 4ED1 C0B8 031A 2E80 4ED1" /* f..U..N.......N. */
+}; +};
+ +
diff --git a/AmphibianDNA/mWave.c.rsrc.rdump b/AmphibianDNA/mWave.c.rsrc.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/AmphibianDNA/mWave.c.rsrc.rdump +++ b/AmphibianDNA/mWave.c.rsrc.rdump
@@ -0,0 +1,190 @@ @@ -0,0 +1,190 @@

View File

@ -2,6 +2,7 @@ From: Horst Beepmanh <>
Subject: AppleTalk Subject: AppleTalk
--- ---
diff --git a/Misc/APTK57.rsrc.rdump b/Misc/APTK57.rsrc.rdump
--- a/Misc/APTK57.rsrc.rdump --- a/Misc/APTK57.rsrc.rdump
+++ b/Misc/APTK57.rsrc.rdump +++ b/Misc/APTK57.rsrc.rdump
@@ -1,114 +1,476 @@ @@ -1,114 +1,476 @@

View File

@ -2,6 +2,7 @@ From: Horst Beepmanh <>
Subject: VM Subject: VM
--- ---
diff --git a/Misc/VM.rsrc.rdump b/Misc/VM.rsrc.rdump
--- a/Misc/VM.rsrc.rdump --- a/Misc/VM.rsrc.rdump
+++ b/Misc/VM.rsrc.rdump +++ b/Misc/VM.rsrc.rdump
@@ -4,15 +4,8 @@ data 'vm ' (0) { @@ -4,15 +4,8 @@ data 'vm ' (0) {

View File

@ -2,6 +2,7 @@ From: Horst Beepmanh <>
Subject: Source Subject: Source
--- ---
diff --git a/Drivers/Video/TFBDriver.a b/Drivers/Video/TFBDriver.a
--- a/Drivers/Video/TFBDriver.a --- a/Drivers/Video/TFBDriver.a
+++ b/Drivers/Video/TFBDriver.a +++ b/Drivers/Video/TFBDriver.a
@@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
@ -27,7 +28,7 @@ Subject: Source
; if new table is different size, reallocate memory ; if new table is different size, reallocate memory
diff --git a/Interfaces/AIncludes/AppleTalk.a b/Interfaces/AIncludes/AppleTalk.a
--- a/Interfaces/AIncludes/AppleTalk.a --- a/Interfaces/AIncludes/AppleTalk.a
+++ b/Interfaces/AIncludes/AppleTalk.a +++ b/Interfaces/AIncludes/AppleTalk.a
@@ -8,9 +8,6 @@ @@ -8,9 +8,6 @@
@ -52,7 +53,7 @@ Subject: Source
; ;
; ;
;+ MPP (control calls to NBP, DDP and ABLAP) ;+ MPP (control calls to NBP, DDP and ABLAP)
diff --git a/Interfaces/AIncludes/GestaltEqu.a b/Interfaces/AIncludes/GestaltEqu.a
--- a/Interfaces/AIncludes/GestaltEqu.a --- a/Interfaces/AIncludes/GestaltEqu.a
+++ b/Interfaces/AIncludes/GestaltEqu.a +++ b/Interfaces/AIncludes/GestaltEqu.a
@@ -10,63 +10,13 @@ @@ -10,63 +10,13 @@
@ -391,7 +392,7 @@ Subject: Source
diff --git a/Interfaces/AIncludes/SonyEqu.a b/Interfaces/AIncludes/SonyEqu.a
--- a/Interfaces/AIncludes/SonyEqu.a --- a/Interfaces/AIncludes/SonyEqu.a
+++ b/Interfaces/AIncludes/SonyEqu.a +++ b/Interfaces/AIncludes/SonyEqu.a
@@ -80,10 +80,22 @@ onMacPP EQU 0 @@ -80,10 +80,22 @@ onMacPP EQU 0
@ -426,7 +427,7 @@ Subject: Source
ENDIF ENDIF
track EQU 0 ; current track location (used for spd) track EQU 0 ; current track location (used for spd)
diff --git a/Interfaces/AIncludes/SysEqu.a b/Interfaces/AIncludes/SysEqu.a
--- a/Interfaces/AIncludes/SysEqu.a --- a/Interfaces/AIncludes/SysEqu.a
+++ b/Interfaces/AIncludes/SysEqu.a +++ b/Interfaces/AIncludes/SysEqu.a
@@ -6,13 +6,8 @@ @@ -6,13 +6,8 @@
@ -482,7 +483,7 @@ Subject: Source
;___________________________________________________________________________ ;___________________________________________________________________________
; ;
diff --git a/Interfaces/AIncludes/Traps.a b/Interfaces/AIncludes/Traps.a
--- a/Interfaces/AIncludes/Traps.a --- a/Interfaces/AIncludes/Traps.a
+++ b/Interfaces/AIncludes/Traps.a +++ b/Interfaces/AIncludes/Traps.a
@@ -9,9 +9,6 @@ @@ -9,9 +9,6 @@
@ -517,7 +518,7 @@ Subject: Source
_SlotVInstall OPWORD $A06F _SlotVInstall OPWORD $A06F
_SlotVRemove OPWORD $A070 _SlotVRemove OPWORD $A070
_AttachVBL OPWORD $A071 _AttachVBL OPWORD $A071
diff --git a/Interfaces/CIncludes/Desk.h b/Interfaces/CIncludes/Desk.h
--- a/Interfaces/CIncludes/Desk.h --- a/Interfaces/CIncludes/Desk.h
+++ b/Interfaces/CIncludes/Desk.h +++ b/Interfaces/CIncludes/Desk.h
@@ -45,7 +45,7 @@ Created: Saturday, July 27, 1991 at 2:53 PM @@ -45,7 +45,7 @@ Created: Saturday, July 27, 1991 at 2:53 PM
@ -529,7 +530,8 @@ Subject: Source
accCursor = 66, accCursor = 66,
accMenu = 67, accMenu = 67,
accUndo = 68, accUndo = 68,
diff --git a/Interfaces/PInterfaces/Sound.p b/Interfaces/PInterfaces/Sound.p
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/PInterfaces/Sound.p +++ b/Interfaces/PInterfaces/Sound.p
@@ -0,0 +1,455 @@ @@ -0,0 +1,455 @@
@ -988,13 +990,14 @@ Subject: Source
+ END. + END.
+{$ENDC} +{$ENDC}
+ +
diff --git a/Interfaces/PInterfaces/Sound.p.idump b/Interfaces/PInterfaces/Sound.p.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Interfaces/PInterfaces/Sound.p.idump +++ b/Interfaces/PInterfaces/Sound.p.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+TEXTMPS +TEXTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Internal/Asm/AppleDeskBusPriv.a b/Internal/Asm/AppleDeskBusPriv.a
--- a/Internal/Asm/AppleDeskBusPriv.a --- a/Internal/Asm/AppleDeskBusPriv.a
+++ b/Internal/Asm/AppleDeskBusPriv.a +++ b/Internal/Asm/AppleDeskBusPriv.a
@@ -11,16 +11,6 @@ @@ -11,16 +11,6 @@
@ -1043,7 +1046,7 @@ Subject: Source
ds.l 1 ; unused space <6> ds.l 1 ; unused space <6>
fDBCmd ds.b 1 ; last fDB command (1 byte) fDBCmd ds.b 1 ; last fDB command (1 byte)
diff --git a/Internal/Asm/Decompression.a b/Internal/Asm/Decompression.a
--- a/Internal/Asm/Decompression.a --- a/Internal/Asm/Decompression.a
+++ b/Internal/Asm/Decompression.a +++ b/Internal/Asm/Decompression.a
@@ -9,8 +9,6 @@ @@ -9,8 +9,6 @@
@ -1064,7 +1067,7 @@ Subject: Source
headerLength DS.W 1 ;length of this header in bytes. headerLength DS.W 1 ;length of this header in bytes.
headerVersion DS.B 1 ;number of items in this header. ( must be < 128 ). headerVersion DS.B 1 ;number of items in this header. ( must be < 128 ).
extendedAttributes DS.B 1 ;extension to the attributes for this resource. extendedAttributes DS.B 1 ;extension to the attributes for this resource.
diff --git a/Internal/Asm/DialogsPriv.a b/Internal/Asm/DialogsPriv.a
--- a/Internal/Asm/DialogsPriv.a --- a/Internal/Asm/DialogsPriv.a
+++ b/Internal/Asm/DialogsPriv.a +++ b/Internal/Asm/DialogsPriv.a
@@ -31,8 +31,6 @@ @@ -31,8 +31,6 @@
@ -1085,7 +1088,7 @@ Subject: Source
; bits for flag byte ; bits for flag byte
cannotTwitchOutOfDialogBit EQU 7 cannotTwitchOutOfDialogBit EQU 7
systemHandlesMenusBit EQU 6 systemHandlesMenusBit EQU 6
diff --git a/Internal/Asm/GestaltPrivateEqu.a b/Internal/Asm/GestaltPrivateEqu.a
--- a/Internal/Asm/GestaltPrivateEqu.a --- a/Internal/Asm/GestaltPrivateEqu.a
+++ b/Internal/Asm/GestaltPrivateEqu.a +++ b/Internal/Asm/GestaltPrivateEqu.a
@@ -165,8 +165,8 @@ size equ * @@ -165,8 +165,8 @@ size equ *
@ -1098,7 +1101,7 @@ Subject: Source
maxSlots ds.l 1 ; number of entries in table maxSlots ds.l 1 ; number of entries in table
memSize ds.l 1 ; amount of memory in this machine memSize ds.l 1 ; amount of memory in this machine
realTop ds.l 1 ; adjusted memory size realTop ds.l 1 ; adjusted memory size
diff --git a/Internal/Asm/HardwarePrivateEqu.a b/Internal/Asm/HardwarePrivateEqu.a
--- a/Internal/Asm/HardwarePrivateEqu.a --- a/Internal/Asm/HardwarePrivateEqu.a
+++ b/Internal/Asm/HardwarePrivateEqu.a +++ b/Internal/Asm/HardwarePrivateEqu.a
@@ -8,40 +8,10 @@ @@ -8,40 +8,10 @@
@ -6720,7 +6723,7 @@ Subject: Source
+ ENDIF ; generated for fun + ENDIF ; generated for fun
+ +
+ +
diff --git a/Internal/Asm/SysPrivateEqu.a b/Internal/Asm/SysPrivateEqu.a
--- a/Internal/Asm/SysPrivateEqu.a --- a/Internal/Asm/SysPrivateEqu.a
+++ b/Internal/Asm/SysPrivateEqu.a +++ b/Internal/Asm/SysPrivateEqu.a
@@ -8,63 +8,6 @@ @@ -8,63 +8,6 @@
@ -6859,7 +6862,7 @@ Subject: Source
emRecSize equ * ; size for this version emRecSize equ * ; size for this version
size equ * size equ *
diff --git a/Internal/Asm/egretequ.a b/Internal/Asm/egretequ.a
--- a/Internal/Asm/egretequ.a --- a/Internal/Asm/egretequ.a
+++ b/Internal/Asm/egretequ.a +++ b/Internal/Asm/egretequ.a
@@ -270,10 +270,7 @@ WrHangTout equ $1E ; set hang threshold @@ -270,10 +270,7 @@ WrHangTout equ $1E ; set hang threshold
@ -6874,7 +6877,7 @@ Subject: Source
; ;
;__________________________________________________________________________________________________ ;__________________________________________________________________________________________________
diff --git a/LinkedPatches/LinkedPatchLoader.a b/LinkedPatches/LinkedPatchLoader.a
--- a/LinkedPatches/LinkedPatchLoader.a --- a/LinkedPatches/LinkedPatchLoader.a
+++ b/LinkedPatches/LinkedPatchLoader.a +++ b/LinkedPatches/LinkedPatchLoader.a
@@ -305,9 +305,6 @@ @@ -305,9 +305,6 @@
@ -6887,7 +6890,7 @@ Subject: Source
dsLinkedPatchReferenceTooFar equ 97 ; *** move into SysErr.a dsLinkedPatchReferenceTooFar equ 97 ; *** move into SysErr.a
k32BitCQDTrap equ $AB03 ; trap number for 32-bit QuickDraw k32BitCQDTrap equ $AB03 ; trap number for 32-bit QuickDraw
diff --git a/OS/ADBMgr/ADBMgrPatch.a b/OS/ADBMgr/ADBMgrPatch.a
--- a/OS/ADBMgr/ADBMgrPatch.a --- a/OS/ADBMgr/ADBMgrPatch.a
+++ b/OS/ADBMgr/ADBMgrPatch.a +++ b/OS/ADBMgr/ADBMgrPatch.a
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
@ -7051,7 +7054,7 @@ Subject: Source
add.b d2,d2 ; shift high bit of ∆ into sign add.b d2,d2 ; shift high bit of ∆ into sign
beq.s @horizDone ; if no change, nothing to update beq.s @horizDone ; if no change, nothing to update
asr.b #1,d2 ; shift ∆ back, sign extended asr.b #1,d2 ; shift ∆ back, sign extended
diff --git a/OS/Gestalt/GestaltExtensions.a b/OS/Gestalt/GestaltExtensions.a
--- a/OS/Gestalt/GestaltExtensions.a --- a/OS/Gestalt/GestaltExtensions.a
+++ b/OS/Gestalt/GestaltExtensions.a +++ b/OS/Gestalt/GestaltExtensions.a
@@ -10,8 +10,6 @@ @@ -10,8 +10,6 @@
@ -7095,7 +7098,7 @@ Subject: Source
import stdResult import stdResult
lea stdResult,a0 lea stdResult,a0
diff --git a/OS/HFS/Cache/DiskCache.a b/OS/HFS/Cache/DiskCache.a
--- a/OS/HFS/Cache/DiskCache.a --- a/OS/HFS/Cache/DiskCache.a
+++ b/OS/HFS/Cache/DiskCache.a +++ b/OS/HFS/Cache/DiskCache.a
@@ -10,19 +10,6 @@ @@ -10,19 +10,6 @@
@ -7233,7 +7236,7 @@ Subject: Source
; The following code is executed while the file system is in a suspended state. ; The following code is executed while the file system is in a suspended state.
; Input: A0.L = ptr(cachevar) ; Input: A0.L = ptr(cachevar)
diff --git a/OS/HFS/Extensions/CMSvcsExtras.a b/OS/HFS/Extensions/CMSvcsExtras.a
--- a/OS/HFS/Extensions/CMSvcsExtras.a --- a/OS/HFS/Extensions/CMSvcsExtras.a
+++ b/OS/HFS/Extensions/CMSvcsExtras.a +++ b/OS/HFS/Extensions/CMSvcsExtras.a
@@ -41,6 +41,14 @@ @@ -41,6 +41,14 @@
@ -7251,7 +7254,7 @@ Subject: Source
;_________________________________________________________________________________ ;_________________________________________________________________________________
; ;
; Routine: CMDeleteCN (Delete CNode) ; Routine: CMDeleteCN (Delete CNode)
diff --git a/OS/HFS/Extensions/DTDBMgr.a b/OS/HFS/Extensions/DTDBMgr.a
--- a/OS/HFS/Extensions/DTDBMgr.a --- a/OS/HFS/Extensions/DTDBMgr.a
+++ b/OS/HFS/Extensions/DTDBMgr.a +++ b/OS/HFS/Extensions/DTDBMgr.a
@@ -13,12 +13,7 @@ @@ -13,12 +13,7 @@
@ -7531,7 +7534,7 @@ Subject: Source
move.w bigPB+ioVAtrb(a6), d0 ; get the volume attributes move.w bigPB+ioVAtrb(a6), d0 ; get the volume attributes
btst.l #15, d0 ; software locked? btst.l #15, d0 ; software locked?
diff --git a/OS/HFS/LaterFileMgrPatches.a b/OS/HFS/LaterFileMgrPatches.a
--- a/OS/HFS/LaterFileMgrPatches.a --- a/OS/HFS/LaterFileMgrPatches.a
+++ b/OS/HFS/LaterFileMgrPatches.a +++ b/OS/HFS/LaterFileMgrPatches.a
@@ -109,5 +109,14 @@ MFSRenamePatch PatchProc ExtFSHook, (Plus) @@ -109,5 +109,14 @@ MFSRenamePatch PatchProc ExtFSHook, (Plus)
@ -7550,7 +7553,7 @@ Subject: Source
endProc endProc
end end
\ No newline at end of file \ No newline at end of file
diff --git a/OS/InterruptHandlers.a b/OS/InterruptHandlers.a
--- a/OS/InterruptHandlers.a --- a/OS/InterruptHandlers.a
+++ b/OS/InterruptHandlers.a +++ b/OS/InterruptHandlers.a
@@ -465,6 +465,11 @@ @@ -465,6 +465,11 @@
@ -7565,7 +7568,7 @@ Subject: Source
InterruptPrims RECORD {intInitPostProc},INCREMENT InterruptPrims RECORD {intInitPostProc},INCREMENT
flags DS.W 1 ; miscellaneous flags flags DS.W 1 ; miscellaneous flags
count DS.W 1 ; number of entries in the table count DS.W 1 ; number of entries in the table
diff --git a/OS/Keyboard/Kbd.r b/OS/Keyboard/Kbd.r
--- a/OS/Keyboard/Kbd.r --- a/OS/Keyboard/Kbd.r
+++ b/OS/Keyboard/Kbd.r +++ b/OS/Keyboard/Kbd.r
@@ -1679,263 +1679,6 @@ resource 'KCHR' (0, USname, KCHRAttributes) { /*<11>*/ @@ -1679,263 +1679,6 @@ resource 'KCHR' (0, USname, KCHRAttributes) { /*<11>*/
@ -7832,7 +7835,7 @@ Subject: Source
#endif #endif
diff --git a/OS/Keyboard/KbdInstall.a b/OS/Keyboard/KbdInstall.a
--- a/OS/Keyboard/KbdInstall.a --- a/OS/Keyboard/KbdInstall.a
+++ b/OS/Keyboard/KbdInstall.a +++ b/OS/Keyboard/KbdInstall.a
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
@ -8235,7 +8238,7 @@ Subject: Source
;_________________________________________________________________________________________ ;_________________________________________________________________________________________
;_________________________________________________________________________________________ ;_________________________________________________________________________________________
;_________________________________________________________________________________________ ;_________________________________________________________________________________________
diff --git a/OS/SCSIMgr/SCSILinkPatch.a b/OS/SCSIMgr/SCSILinkPatch.a
--- a/OS/SCSIMgr/SCSILinkPatch.a --- a/OS/SCSIMgr/SCSILinkPatch.a
+++ b/OS/SCSIMgr/SCSILinkPatch.a +++ b/OS/SCSIMgr/SCSILinkPatch.a
@@ -493,6 +493,7 @@ SCSIBusyCommon @@ -493,6 +493,7 @@ SCSIBusyCommon
@ -8246,7 +8249,7 @@ Subject: Source
FreeHookPending dc.l 0 ; location of pending free-hook flag FreeHookPending dc.l 0 ; location of pending free-hook flag
SCSIBusyVector dc.l 0 SCSIBusyVector dc.l 0
diff --git a/OS/SCSIMgr/SCSIMgrInit96.a b/OS/SCSIMgr/SCSIMgrInit96.a
--- a/OS/SCSIMgr/SCSIMgrInit96.a --- a/OS/SCSIMgr/SCSIMgrInit96.a
+++ b/OS/SCSIMgr/SCSIMgrInit96.a +++ b/OS/SCSIMgr/SCSIMgrInit96.a
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
@ -8258,7 +8261,7 @@ Subject: Source
INCLUDE 'SCSI.a' INCLUDE 'SCSI.a'
INCLUDE 'SCSIPriv.a' INCLUDE 'SCSIPriv.a'
INCLUDE 'UniversalEqu.a' ; for TestFor <T2> INCLUDE 'UniversalEqu.a' ; for TestFor <T2>
diff --git a/OS/SlotMgr/SlotMgr.a b/OS/SlotMgr/SlotMgr.a
--- a/OS/SlotMgr/SlotMgr.a --- a/OS/SlotMgr/SlotMgr.a
+++ b/OS/SlotMgr/SlotMgr.a +++ b/OS/SlotMgr/SlotMgr.a
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
@ -9122,7 +9125,7 @@ Subject: Source
Endp ; must have endp for RAM builds <djw> Endp ; must have endp for RAM builds <djw>
End End
diff --git a/OS/SlotMgr/SlotMgrInit.a b/OS/SlotMgr/SlotMgrInit.a
--- a/OS/SlotMgr/SlotMgrInit.a --- a/OS/SlotMgr/SlotMgrInit.a
+++ b/OS/SlotMgr/SlotMgrInit.a +++ b/OS/SlotMgr/SlotMgrInit.a
@@ -13,73 +13,8 @@ @@ -13,73 +13,8 @@
@ -10291,7 +10294,7 @@ Subject: Source
SecondaryEnd SecondaryEnd
diff --git a/OS/StartMgr/Boot3.a b/OS/StartMgr/Boot3.a
--- a/OS/StartMgr/Boot3.a --- a/OS/StartMgr/Boot3.a
+++ b/OS/StartMgr/Boot3.a +++ b/OS/StartMgr/Boot3.a
@@ -23,59 +23,7 @@ @@ -23,59 +23,7 @@
@ -10998,7 +11001,7 @@ Subject: Source
EndOfBootCode EndOfBootCode
diff --git a/Patches/BeforePatches.a b/Patches/BeforePatches.a
--- a/Patches/BeforePatches.a --- a/Patches/BeforePatches.a
+++ b/Patches/BeforePatches.a +++ b/Patches/BeforePatches.a
@@ -585,6 +585,7 @@ RAMSysInit PROC EXPORT @@ -585,6 +585,7 @@ RAMSysInit PROC EXPORT
@ -11009,7 +11012,7 @@ Subject: Source
cmp.b #useATalk,d0 ; <26> Configured for AppleTalk? cmp.b #useATalk,d0 ; <26> Configured for AppleTalk?
beq.s @appleTalkIsActive ; <26> Yes. Dont set emAppleTalkInactiveOnBoot beq.s @appleTalkIsActive ; <26> Yes. Dont set emAppleTalkInactiveOnBoot
diff --git a/Patches/PatchIIROM.a b/Patches/PatchIIROM.a
--- a/Patches/PatchIIROM.a --- a/Patches/PatchIIROM.a
+++ b/Patches/PatchIIROM.a +++ b/Patches/PatchIIROM.a
@@ -6982,6 +6982,7 @@ InitSlotStuff @@ -6982,6 +6982,7 @@ InitSlotStuff
@ -11020,7 +11023,7 @@ Subject: Source
moveq #sNumSlots-1,d1 ; move sNumSlots queue headers moveq #sNumSlots-1,d1 ; move sNumSlots queue headers
lea ([SlotQDT],\ ; point to ticks for last slot lea ([SlotQDT],\ ; point to ticks for last slot
slotVBLInfos+slotTickCount-\ slotVBLInfos+slotTickCount-\
diff --git a/Patches/PatchIIciROM.a b/Patches/PatchIIciROM.a
--- a/Patches/PatchIIciROM.a --- a/Patches/PatchIIciROM.a
+++ b/Patches/PatchIIciROM.a +++ b/Patches/PatchIIciROM.a
@@ -596,7 +596,6 @@ Scripts604 EQU 0 ;<4.7><08/21/89 pke> @@ -596,7 +596,6 @@ Scripts604 EQU 0 ;<4.7><08/21/89 pke>
@ -11205,7 +11208,7 @@ Subject: Source
;---------------------------------------------------------------------------------------------------- ;----------------------------------------------------------------------------------------------------
; This patch bypasses the physical read of egret when reading the time. The time is automatically ; This patch bypasses the physical read of egret when reading the time. The time is automatically
; updated in the background, therefore the low mem global always reflects the acurate time. ; updated in the background, therefore the low mem global always reflects the acurate time.
diff --git a/Patches/ProcessManagerSegmentTweaks.a b/Patches/ProcessManagerSegmentTweaks.a
--- a/Patches/ProcessManagerSegmentTweaks.a --- a/Patches/ProcessManagerSegmentTweaks.a
+++ b/Patches/ProcessManagerSegmentTweaks.a +++ b/Patches/ProcessManagerSegmentTweaks.a
@@ -34,21 +34,11 @@ LoadProcessManagerSegmentsLowerInSysHeap InstallProc (Plus,SE,II,IIci,Portable) @@ -34,21 +34,11 @@ LoadProcessManagerSegmentsLowerInSysHeap InstallProc (Plus,SE,II,IIci,Portable)
@ -11250,7 +11253,7 @@ Subject: Source
EndProc EndProc
End End
\ No newline at end of file \ No newline at end of file
diff --git a/Patches/VideoPatch.a b/Patches/VideoPatch.a
--- a/Patches/VideoPatch.a --- a/Patches/VideoPatch.a
+++ b/Patches/VideoPatch.a +++ b/Patches/VideoPatch.a
@@ -474,14 +474,16 @@ ROMMinVer Equ $12 ; Offset from ROMBase to RAM Major version word. @@ -474,14 +474,16 @@ ROMMinVer Equ $12 ; Offset from ROMBase to RAM Major version word.
@ -11279,7 +11282,7 @@ Subject: Source
Move.w #catDisplay,spCategory(A0) ; Look for: Display, Move.w #catDisplay,spCategory(A0) ; Look for: Display,
Move.w #typVideo,spCType(A0) ; Video, Move.w #typVideo,spCType(A0) ; Video,
Move.w #drSwApple,spDrvrSW(A0) ; Apple, Move.w #drSwApple,spDrvrSW(A0) ; Apple,
diff --git a/ProcessMgr/DAHandler.a b/ProcessMgr/DAHandler.a
--- a/ProcessMgr/DAHandler.a --- a/ProcessMgr/DAHandler.a
+++ b/ProcessMgr/DAHandler.a +++ b/ProcessMgr/DAHandler.a
@@ -9,8 +9,6 @@ @@ -9,8 +9,6 @@
@ -11314,7 +11317,7 @@ Subject: Source
+ JMP (A0) + JMP (A0)
+ +
END END
diff --git a/ProcessMgr/DAHandler.c b/ProcessMgr/DAHandler.c
--- a/ProcessMgr/DAHandler.c --- a/ProcessMgr/DAHandler.c
+++ b/ProcessMgr/DAHandler.c +++ b/ProcessMgr/DAHandler.c
@@ -9,8 +9,6 @@ @@ -9,8 +9,6 @@
@ -11343,7 +11346,7 @@ Subject: Source
{ {
qdInfo &= 0xFFFF; qdInfo &= 0xFFFF;
Colorized = (qdInfo >= gestalt8BitQD); Colorized = (qdInfo >= gestalt8BitQD);
diff --git a/ProcessMgr/DeskMgrPatches.c b/ProcessMgr/DeskMgrPatches.c
--- a/ProcessMgr/DeskMgrPatches.c --- a/ProcessMgr/DeskMgrPatches.c
+++ b/ProcessMgr/DeskMgrPatches.c +++ b/ProcessMgr/DeskMgrPatches.c
@@ -65,7 +65,6 @@ @@ -65,7 +65,6 @@
@ -11354,7 +11357,7 @@ Subject: Source
#include <MFPrivate.h> #include <MFPrivate.h>
#include <MenuMgrPriv.h> #include <MenuMgrPriv.h>
#include <ResourceMgrPriv.h> #include <ResourceMgrPriv.h>
diff --git a/ProcessMgr/Eppc.c b/ProcessMgr/Eppc.c
--- a/ProcessMgr/Eppc.c --- a/ProcessMgr/Eppc.c
+++ b/ProcessMgr/Eppc.c +++ b/ProcessMgr/Eppc.c
@@ -11,8 +11,6 @@ @@ -11,8 +11,6 @@
@ -11377,7 +11380,7 @@ Subject: Source
#include <PPCToolBox.h> #include <PPCToolBox.h>
#include <AppleEventsInternal.h> #include <AppleEventsInternal.h>
#include <Errors.h> #include <Errors.h>
diff --git a/ProcessMgr/Glue.h b/ProcessMgr/Glue.h
--- a/ProcessMgr/Glue.h --- a/ProcessMgr/Glue.h
+++ b/ProcessMgr/Glue.h +++ b/ProcessMgr/Glue.h
@@ -150,4 +150,6 @@ debugger(StringPtr message) @@ -150,4 +150,6 @@ debugger(StringPtr message)
@ -11387,7 +11390,7 @@ Subject: Source
+pascal OSErr MyGestalt(OSType selector,long *response); +pascal OSErr MyGestalt(OSType selector,long *response);
+ +
#endif __GLUE__ #endif __GLUE__
diff --git a/ProcessMgr/ProcessMgrMisc.a b/ProcessMgr/ProcessMgrMisc.a
--- a/ProcessMgr/ProcessMgrMisc.a --- a/ProcessMgr/ProcessMgrMisc.a
+++ b/ProcessMgr/ProcessMgrMisc.a +++ b/ProcessMgr/ProcessMgrMisc.a
@@ -10,12 +10,6 @@ @@ -10,12 +10,6 @@
@ -11442,7 +11445,7 @@ Subject: Source
+ JMP (A0) + JMP (A0)
+ +
END END
diff --git a/ProcessMgr/Processes.c b/ProcessMgr/Processes.c
--- a/ProcessMgr/Processes.c --- a/ProcessMgr/Processes.c
+++ b/ProcessMgr/Processes.c +++ b/ProcessMgr/Processes.c
@@ -742,7 +742,9 @@ CreateProcess(InternalLaunchPBPtr pParams, PEntryPtr pNewProc, PEntryPtr pLaunch @@ -742,7 +742,9 @@ CreateProcess(InternalLaunchPBPtr pParams, PEntryPtr pNewProc, PEntryPtr pLaunch
@ -11455,7 +11458,7 @@ Subject: Source
ReleaseResource(SAVESEGHANDLE); ReleaseResource(SAVESEGHANDLE);
/* Try to set APPLLIMIT to ssize below current stack. We get an error if this /* Try to set APPLLIMIT to ssize below current stack. We get an error if this
diff --git a/ProcessMgr/Startup.c b/ProcessMgr/Startup.c
--- a/ProcessMgr/Startup.c --- a/ProcessMgr/Startup.c
+++ b/ProcessMgr/Startup.c +++ b/ProcessMgr/Startup.c
@@ -9,9 +9,6 @@ @@ -9,9 +9,6 @@
@ -11511,7 +11514,7 @@ Subject: Source
AUXIsPresent = true; AUXIsPresent = true;
#endif HAS_AUX_PROCESSMGR #endif HAS_AUX_PROCESSMGR
} }
diff --git a/ProcessMgr/Switch.a b/ProcessMgr/Switch.a
--- a/ProcessMgr/Switch.a --- a/ProcessMgr/Switch.a
+++ b/ProcessMgr/Switch.a +++ b/ProcessMgr/Switch.a
@@ -9,17 +9,6 @@ @@ -9,17 +9,6 @@
@ -11608,7 +11611,7 @@ Subject: Source
bra.s RestoreAllLoop ; now get next entry bra.s RestoreAllLoop ; now get next entry
diff --git a/ProcessMgr/Switch.c b/ProcessMgr/Switch.c
--- a/ProcessMgr/Switch.c --- a/ProcessMgr/Switch.c
+++ b/ProcessMgr/Switch.c +++ b/ProcessMgr/Switch.c
@@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
@ -11637,7 +11640,7 @@ Subject: Source
SetCurLayer(pc->curlayer); SetCurLayer(pc->curlayer);
TOPMAPHANDLE = pc->topmaphandle; TOPMAPHANDLE = pc->topmaphandle;
CURMAP = pc->curmap; CURMAP = pc->curmap;
diff --git a/ProcessMgr/WindowMgrPatches.c b/ProcessMgr/WindowMgrPatches.c
--- a/ProcessMgr/WindowMgrPatches.c --- a/ProcessMgr/WindowMgrPatches.c
+++ b/ProcessMgr/WindowMgrPatches.c +++ b/ProcessMgr/WindowMgrPatches.c
@@ -9,11 +9,6 @@ @@ -9,11 +9,6 @@
@ -11669,7 +11672,7 @@ Subject: Source
ShowCursor(); ShowCursor();
olda5 = ProcessMgrA5SimpleSetup(); olda5 = ProcessMgrA5SimpleSetup();
diff --git a/QuickDraw/BitBlt.a b/QuickDraw/BitBlt.a
--- a/QuickDraw/BitBlt.a --- a/QuickDraw/BitBlt.a
+++ b/QuickDraw/BitBlt.a +++ b/QuickDraw/BitBlt.a
@@ -10,14 +10,6 @@ @@ -10,14 +10,6 @@
@ -11940,7 +11943,7 @@ Subject: Source
@1: sub.l (SP),D6 ;bump src right OR left by 1 pixel first time only <14AUG90 KON> @1: sub.l (SP),D6 ;bump src right OR left by 1 pixel first time only <14AUG90 KON>
lea @RealbTransparent,a1 ;remember correct entry point for remaining scans <14AUG90 KON> lea @RealbTransparent,a1 ;remember correct entry point for remaining scans <14AUG90 KON>
@RealbTransparent @RealbTransparent
diff --git a/QuickDraw/CCrsrCore.a b/QuickDraw/CCrsrCore.a
--- a/QuickDraw/CCrsrCore.a --- a/QuickDraw/CCrsrCore.a
+++ b/QuickDraw/CCrsrCore.a +++ b/QuickDraw/CCrsrCore.a
@@ -12,9 +12,6 @@ @@ -12,9 +12,6 @@
@ -12026,7 +12029,7 @@ Subject: Source
MOVE.L CRSRPTR,A0 ;get handle to cursor data MOVE.L CRSRPTR,A0 ;get handle to cursor data
MOVE.L (A0),A0 ;get pointer to cursor data MOVE.L (A0),A0 ;get pointer to cursor data
diff --git a/QuickDraw/ColorMgr.a b/QuickDraw/ColorMgr.a
--- a/QuickDraw/ColorMgr.a --- a/QuickDraw/ColorMgr.a
+++ b/QuickDraw/ColorMgr.a +++ b/QuickDraw/ColorMgr.a
@@ -5,19 +5,9 @@ @@ -5,19 +5,9 @@
@ -12146,7 +12149,7 @@ Subject: Source
+@done RTD #2 ; Lose ID, and go home. +@done RTD #2 ; Lose ID, and go home.
diff --git a/QuickDraw/FastTraps.a b/QuickDraw/FastTraps.a
--- a/QuickDraw/FastTraps.a --- a/QuickDraw/FastTraps.a
+++ b/QuickDraw/FastTraps.a +++ b/QuickDraw/FastTraps.a
@@ -7,10 +7,6 @@ @@ -7,10 +7,6 @@
@ -12304,7 +12307,7 @@ Subject: Source
_QDExtensions _QDExtensions
ENDM ENDM
diff --git a/QuickDraw/GDevice.a b/QuickDraw/GDevice.a
--- a/QuickDraw/GDevice.a --- a/QuickDraw/GDevice.a
+++ b/QuickDraw/GDevice.a +++ b/QuickDraw/GDevice.a
@@ -13,12 +13,6 @@ @@ -13,12 +13,6 @@
@ -12338,7 +12341,7 @@ Subject: Source
MOVE.L A4,spsPointer(A0) ; Restore the pointer to mode list. <C742> MOVE.L A4,spsPointer(A0) ; Restore the pointer to mode list. <C742>
bra.s TableOK bra.s TableOK
diff --git a/QuickDraw/GWorld.a b/QuickDraw/GWorld.a
--- a/QuickDraw/GWorld.a --- a/QuickDraw/GWorld.a
+++ b/QuickDraw/GWorld.a +++ b/QuickDraw/GWorld.a
@@ -7,9 +7,6 @@ @@ -7,9 +7,6 @@
@ -12364,7 +12367,7 @@ Subject: Source
move d0,bytesPerRow(a6) ; save # of bytes in a row move d0,bytesPerRow(a6) ; save # of bytes in a row
move localRect+bottom(a6),d1 ; compute height of rectangle move localRect+bottom(a6),d1 ; compute height of rectangle
diff --git a/QuickDraw/PaletteMgr.a b/QuickDraw/PaletteMgr.a
--- a/QuickDraw/PaletteMgr.a --- a/QuickDraw/PaletteMgr.a
+++ b/QuickDraw/PaletteMgr.a +++ b/QuickDraw/PaletteMgr.a
@@ -9,18 +9,9 @@ @@ -9,18 +9,9 @@
@ -12463,7 +12466,7 @@ Subject: Source
CLR.L -(SP) ; Activate the front palette CLR.L -(SP) ; Activate the front palette
_FrontWindow ; before drawing anything. _FrontWindow ; before drawing anything.
diff --git a/QuickDraw/Patches/DrawPicture32Patch.a b/QuickDraw/Patches/DrawPicture32Patch.a
--- a/QuickDraw/Patches/DrawPicture32Patch.a --- a/QuickDraw/Patches/DrawPicture32Patch.a
+++ b/QuickDraw/Patches/DrawPicture32Patch.a +++ b/QuickDraw/Patches/DrawPicture32Patch.a
@@ -470,6 +470,139 @@ FixStdGetPicInGetPicData INSTALLPROC (Plus) @@ -470,6 +470,139 @@ FixStdGetPicInGetPicData INSTALLPROC (Plus)
@ -12606,7 +12609,7 @@ Subject: Source
ENDPROC ENDPROC
GETUBYTE FUNC EXPORT GETUBYTE FUNC EXPORT
diff --git a/QuickDraw/Patches/DrawPicturePortable.a b/QuickDraw/Patches/DrawPicturePortable.a
--- a/QuickDraw/Patches/DrawPicturePortable.a --- a/QuickDraw/Patches/DrawPicturePortable.a
+++ b/QuickDraw/Patches/DrawPicturePortable.a +++ b/QuickDraw/Patches/DrawPicturePortable.a
@@ -1861,5 +1861,1318 @@ ABORT jmpROM RomAbort ; Jump into ROM @@ -1861,5 +1861,1318 @@ ABORT jmpROM RomAbort ; Jump into ROM
@ -13928,7 +13931,7 @@ Subject: Source
+ +
ENDPROC ENDPROC
diff --git a/QuickDraw/Patterns.a b/QuickDraw/Patterns.a
--- a/QuickDraw/Patterns.a --- a/QuickDraw/Patterns.a
+++ b/QuickDraw/Patterns.a +++ b/QuickDraw/Patterns.a
@@ -12,8 +12,6 @@ @@ -12,8 +12,6 @@
@ -13949,7 +13952,7 @@ Subject: Source
NOP ; silence the assembler <13> NOP ; silence the assembler <13>
diff --git a/QuickDraw/Pictures.a b/QuickDraw/Pictures.a
--- a/QuickDraw/Pictures.a --- a/QuickDraw/Pictures.a
+++ b/QuickDraw/Pictures.a +++ b/QuickDraw/Pictures.a
@@ -14,11 +14,6 @@ @@ -14,11 +14,6 @@
@ -14016,7 +14019,7 @@ Subject: Source
GOHOME MOVEM.L (SP)+,D3-D7/A2-A4 ;RESTORE REGISTERS GOHOME MOVEM.L (SP)+,D3-D7/A2-A4 ;RESTORE REGISTERS
UNLINK PARAMSIZE,'DRAWPICT' UNLINK PARAMSIZE,'DRAWPICT'
diff --git a/QuickDraw/QD.a b/QuickDraw/QD.a
--- a/QuickDraw/QD.a --- a/QuickDraw/QD.a
+++ b/QuickDraw/QD.a +++ b/QuickDraw/QD.a
@@ -9,8 +9,6 @@ @@ -9,8 +9,6 @@
@ -14052,7 +14055,7 @@ Subject: Source
lea $4081c11c,a0 ;point to copyright notice in rom78 lea $4081c11c,a0 ;point to copyright notice in rom78
move.l a0,d7 ;make a copy move.l a0,d7 ;make a copy
diff --git a/QuickDraw/QDHooks.a b/QuickDraw/QDHooks.a
--- a/QuickDraw/QDHooks.a --- a/QuickDraw/QDHooks.a
+++ b/QuickDraw/QDHooks.a +++ b/QuickDraw/QDHooks.a
@@ -9,8 +9,6 @@ @@ -9,8 +9,6 @@
@ -14092,7 +14095,7 @@ Subject: Source
MACRO MACRO
_BitBlt _BitBlt
diff --git a/QuickDraw/QDUtil.a b/QuickDraw/QDUtil.a
--- a/QuickDraw/QDUtil.a --- a/QuickDraw/QDUtil.a
+++ b/QuickDraw/QDUtil.a +++ b/QuickDraw/QDUtil.a
@@ -11,9 +11,6 @@ @@ -11,9 +11,6 @@
@ -14371,7 +14374,7 @@ Subject: Source
GetCPixel FUNC EXPORT GetCPixel FUNC EXPORT
EXPORT GETPIXEL EXPORT GETPIXEL
IMPORT HideCursor,ShowCursor,PortToMap IMPORT HideCursor,ShowCursor,PortToMap
diff --git a/QuickDraw/Regions.a b/QuickDraw/Regions.a
--- a/QuickDraw/Regions.a --- a/QuickDraw/Regions.a
+++ b/QuickDraw/Regions.a +++ b/QuickDraw/Regions.a
@@ -7,7 +7,6 @@ @@ -7,7 +7,6 @@
@ -14395,7 +14398,7 @@ Subject: Source
MOVE.L PAT(A6),-(SP) ;PUSH PAT MOVE.L PAT(A6),-(SP) ;PUSH PAT
MOVE.L CLIPRGN(A1),-(SP) ;PUSH CLIPRGN MOVE.L CLIPRGN(A1),-(SP) ;PUSH CLIPRGN
MOVE.L VISRGN(A1),-(SP) ;PUSH VISRGN MOVE.L VISRGN(A1),-(SP) ;PUSH VISRGN
diff --git a/QuickDraw/RgnBlt.a b/QuickDraw/RgnBlt.a
--- a/QuickDraw/RgnBlt.a --- a/QuickDraw/RgnBlt.a
+++ b/QuickDraw/RgnBlt.a +++ b/QuickDraw/RgnBlt.a
@@ -10,13 +10,6 @@ @@ -10,13 +10,6 @@
@ -14452,7 +14455,7 @@ Subject: Source
MOVE patHMask(A6),D1 ;set up source constriction MOVE patHMask(A6),D1 ;set up source constriction
MOVE pixInLong1(A6),A0 ;set up absolute long bump MOVE pixInLong1(A6),A0 ;set up absolute long bump
MOVE longBump(A6),A2 ;set up long bump MOVE longBump(A6),A2 ;set up long bump
diff --git a/QuickDraw/ScaleBlt.a b/QuickDraw/ScaleBlt.a
--- a/QuickDraw/ScaleBlt.a --- a/QuickDraw/ScaleBlt.a
+++ b/QuickDraw/ScaleBlt.a +++ b/QuickDraw/ScaleBlt.a
@@ -7,11 +7,6 @@ @@ -7,11 +7,6 @@
@ -14535,7 +14538,7 @@ Subject: Source
add.w d5,d6 ;bump src offset add.w d5,d6 ;bump src offset
move.w d6,d5 ;make a copy move.w d6,d5 ;make a copy
and.w #$1f,d6 ;make offset mod 32 and.w #$1f,d6 ;make offset mod 32
diff --git a/QuickDraw/Stretch.a b/QuickDraw/Stretch.a
--- a/QuickDraw/Stretch.a --- a/QuickDraw/Stretch.a
+++ b/QuickDraw/Stretch.a +++ b/QuickDraw/Stretch.a
@@ -885,16 +885,6 @@ skipTable @@ -885,16 +885,6 @@ skipTable
@ -14555,7 +14558,7 @@ Subject: Source
; ;
; fcolor and bcolor were mapped using search proc by colormap. We want to use ; fcolor and bcolor were mapped using search proc by colormap. We want to use
; the unmapped versions. ; the unmapped versions.
diff --git a/Resources/Sys.r b/Resources/Sys.r
--- a/Resources/Sys.r --- a/Resources/Sys.r
+++ b/Resources/Sys.r +++ b/Resources/Sys.r
@@ -9,10 +9,6 @@ @@ -9,10 +9,6 @@
@ -14869,7 +14872,7 @@ Subject: Source
-}; -};
#endif #endif
\ No newline at end of file \ No newline at end of file
diff --git a/Tidbits/UserAlerts.a b/Tidbits/UserAlerts.a
--- a/Tidbits/UserAlerts.a --- a/Tidbits/UserAlerts.a
+++ b/Tidbits/UserAlerts.a +++ b/Tidbits/UserAlerts.a
@@ -9,10 +9,6 @@ @@ -9,10 +9,6 @@
@ -15168,7 +15171,7 @@ Subject: Source
; ————————————————————————————————————————————————— ; —————————————————————————————————————————————————
; ;
; DrawCurrentName is used to draw the name of the INIT or application which ate up too much memory. ; DrawCurrentName is used to draw the name of the INIT or application which ate up too much memory.
diff --git a/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.c b/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.c
--- a/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.c --- a/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.c
+++ b/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.c +++ b/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.c
@@ -225,8 +225,8 @@ err1: @@ -225,8 +225,8 @@ err1:
@ -15182,7 +15185,7 @@ Subject: Source
return( nil ); return( nil );
} }
diff --git a/Toolbox/ControlMgr/ButtonCDEF.a b/Toolbox/ControlMgr/ButtonCDEF.a
--- a/Toolbox/ControlMgr/ButtonCDEF.a --- a/Toolbox/ControlMgr/ButtonCDEF.a
+++ b/Toolbox/ControlMgr/ButtonCDEF.a +++ b/Toolbox/ControlMgr/ButtonCDEF.a
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
@ -15202,7 +15205,7 @@ Subject: Source
; save the current ports colors and textMode <C59/30Jun86> DAF ; save the current ports colors and textMode <C59/30Jun86> DAF
diff --git a/Toolbox/ControlMgr/PopupCDEF.c b/Toolbox/ControlMgr/PopupCDEF.c
--- a/Toolbox/ControlMgr/PopupCDEF.c --- a/Toolbox/ControlMgr/PopupCDEF.c
+++ b/Toolbox/ControlMgr/PopupCDEF.c +++ b/Toolbox/ControlMgr/PopupCDEF.c
@@ -9,8 +9,6 @@ @@ -9,8 +9,6 @@
@ -15232,7 +15235,7 @@ Subject: Source
if (theHandle != nil) { // load in spandex MDEF if (theHandle != nil) { // load in spandex MDEF
LoadResource( (Handle) theHandle ); // load in case of purged -- now unpurgeable so remove this LoadResource( (Handle) theHandle ); // load in case of purged -- now unpurgeable so remove this
HLock( (Handle) theHandle ); HLock( (Handle) theHandle );
diff --git a/Toolbox/ControlMgr/ScrollBarCDEF.a b/Toolbox/ControlMgr/ScrollBarCDEF.a
--- a/Toolbox/ControlMgr/ScrollBarCDEF.a --- a/Toolbox/ControlMgr/ScrollBarCDEF.a
+++ b/Toolbox/ControlMgr/ScrollBarCDEF.a +++ b/Toolbox/ControlMgr/ScrollBarCDEF.a
@@ -12,34 +12,6 @@ @@ -12,34 +12,6 @@
@ -15652,7 +15655,7 @@ Subject: Source
@colorWindow ; yes => use the HiliteMode @colorWindow ; yes => use the HiliteMode
bsr SetupWMgrCPort bsr SetupWMgrCPort
move.w #hilite,-(sp) ; set HiliteMode move.w #hilite,-(sp) ; set HiliteMode
diff --git a/Toolbox/DiskInit/DiskInitBadBlock.c b/Toolbox/DiskInit/DiskInitBadBlock.c
--- a/Toolbox/DiskInit/DiskInitBadBlock.c --- a/Toolbox/DiskInit/DiskInitBadBlock.c
+++ b/Toolbox/DiskInit/DiskInitBadBlock.c +++ b/Toolbox/DiskInit/DiskInitBadBlock.c
@@ -98,10 +98,6 @@ @@ -98,10 +98,6 @@
@ -15666,7 +15669,7 @@ Subject: Source
#define BUFSIZE 18 /* test buffer size, in sectors (mb >=18) */ #define BUFSIZE 18 /* test buffer size, in sectors (mb >=18) */
/* 18 is bad 'cause it's greater than a track (KSCT) */ /* 18 is bad 'cause it's greater than a track (KSCT) */
#define CLUMP 1 /* coallesce badspots only if they are contig */ #define CLUMP 1 /* coallesce badspots only if they are contig */
diff --git a/Toolbox/ListMgr/TextLDEF.a b/Toolbox/ListMgr/TextLDEF.a
--- a/Toolbox/ListMgr/TextLDEF.a --- a/Toolbox/ListMgr/TextLDEF.a
+++ b/Toolbox/ListMgr/TextLDEF.a +++ b/Toolbox/ListMgr/TextLDEF.a
@@ -21,7 +21,6 @@ @@ -21,7 +21,6 @@
@ -15686,7 +15689,7 @@ Subject: Source
addq #2,sp ; <11> Width isnt needed til after truncation. Lose it. addq #2,sp ; <11> Width isnt needed til after truncation. Lose it.
diff --git a/Toolbox/MenuMgr/MenuMgr.a b/Toolbox/MenuMgr/MenuMgr.a
--- a/Toolbox/MenuMgr/MenuMgr.a --- a/Toolbox/MenuMgr/MenuMgr.a
+++ b/Toolbox/MenuMgr/MenuMgr.a +++ b/Toolbox/MenuMgr/MenuMgr.a
@@ -408,6 +408,11 @@ GetParamRamData PROC ENTRY @@ -408,6 +408,11 @@ GetParamRamData PROC ENTRY
@ -15701,7 +15704,7 @@ Subject: Source
InitProcMenu PROC EXPORT InitProcMenu PROC EXPORT
; Begin <2.3 EMT> ; Begin <2.3 EMT>
diff --git a/Toolbox/MenuMgr/MenuMgrPatch.a b/Toolbox/MenuMgr/MenuMgrPatch.a
--- a/Toolbox/MenuMgr/MenuMgrPatch.a --- a/Toolbox/MenuMgr/MenuMgrPatch.a
+++ b/Toolbox/MenuMgr/MenuMgrPatch.a +++ b/Toolbox/MenuMgr/MenuMgrPatch.a
@@ -70,7 +70,8 @@ @@ -70,7 +70,8 @@
@ -15723,7 +15726,7 @@ Subject: Source
;———————————————————————————————————————————————————————————————————————————————————————————————————— ;————————————————————————————————————————————————————————————————————————————————————————————————————
; SetClipForCallDrawMDEF ; SetClipForCallDrawMDEF
; ;
diff --git a/Toolbox/MenuMgr/StandardMBDF.a b/Toolbox/MenuMgr/StandardMBDF.a
--- a/Toolbox/MenuMgr/StandardMBDF.a --- a/Toolbox/MenuMgr/StandardMBDF.a
+++ b/Toolbox/MenuMgr/StandardMBDF.a +++ b/Toolbox/MenuMgr/StandardMBDF.a
@@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
@ -15761,7 +15764,7 @@ Subject: Source
CMP.W #1,param2(a6) ; hi-word has hilite CMP.W #1,param2(a6) ; hi-word has hilite
BGT.S DoneHilite ; if not in range we support then bye-bye BGT.S DoneHilite ; if not in range we support then bye-bye
diff --git a/Toolbox/MenuMgr/StandardMDEF.a b/Toolbox/MenuMgr/StandardMDEF.a
--- a/Toolbox/MenuMgr/StandardMDEF.a --- a/Toolbox/MenuMgr/StandardMDEF.a
+++ b/Toolbox/MenuMgr/StandardMDEF.a +++ b/Toolbox/MenuMgr/StandardMDEF.a
@@ -11,15 +11,7 @@ @@ -11,15 +11,7 @@
@ -15860,7 +15863,7 @@ Subject: Source
rts ; all done! so return to dispatcher rts ; all done! so return to dispatcher
diff --git a/Toolbox/ResourceMgr/ResourceMgrExtensions.a b/Toolbox/ResourceMgr/ResourceMgrExtensions.a
--- a/Toolbox/ResourceMgr/ResourceMgrExtensions.a --- a/Toolbox/ResourceMgr/ResourceMgrExtensions.a
+++ b/Toolbox/ResourceMgr/ResourceMgrExtensions.a +++ b/Toolbox/ResourceMgr/ResourceMgrExtensions.a
@@ -1989,6 +1989,245 @@ MakeOverrideMap Proc Export @@ -1989,6 +1989,245 @@ MakeOverrideMap Proc Export
@ -16109,7 +16112,7 @@ Subject: Source
;____________________________________________________________________________________________________ ;____________________________________________________________________________________________________
; InsertOverrideMap(overrideMap, mapToOverride: Handle); ; InsertOverrideMap(overrideMap, mapToOverride: Handle);
; ;
diff --git a/Toolbox/ResourceMgr/ResourceMgrPatches.a b/Toolbox/ResourceMgr/ResourceMgrPatches.a
--- a/Toolbox/ResourceMgr/ResourceMgrPatches.a --- a/Toolbox/ResourceMgr/ResourceMgrPatches.a
+++ b/Toolbox/ResourceMgr/ResourceMgrPatches.a +++ b/Toolbox/ResourceMgr/ResourceMgrPatches.a
@@ -775,247 +775,6 @@ MyGetResource PatchProc _GetResource,(Plus,SE,II,Portable,IIci) @@ -775,247 +775,6 @@ MyGetResource PatchProc _GetResource,(Plus,SE,II,Portable,IIci)
@ -16360,7 +16363,7 @@ Subject: Source
;———————————————————————————————————————————————————————————————————————————————————————————————————— ;————————————————————————————————————————————————————————————————————————————————————————————————————
; STILL TO DO ; STILL TO DO
diff --git a/Toolbox/ResourceMgr/ResourceOverridePatches.a b/Toolbox/ResourceMgr/ResourceOverridePatches.a
--- a/Toolbox/ResourceMgr/ResourceOverridePatches.a --- a/Toolbox/ResourceMgr/ResourceOverridePatches.a
+++ b/Toolbox/ResourceMgr/ResourceOverridePatches.a +++ b/Toolbox/ResourceMgr/ResourceOverridePatches.a
@@ -203,6 +203,10 @@ @@ -203,6 +203,10 @@
@ -16374,7 +16377,7 @@ Subject: Source
include 'Traps.a' include 'Traps.a'
include 'SysEqu.a' include 'SysEqu.a'
include 'SysErr.a' include 'SysErr.a'
diff --git a/Toolbox/ScriptMgr/International.r b/Toolbox/ScriptMgr/International.r
--- a/Toolbox/ScriptMgr/International.r --- a/Toolbox/ScriptMgr/International.r
+++ b/Toolbox/ScriptMgr/International.r +++ b/Toolbox/ScriptMgr/International.r
@@ -646,7 +646,7 @@ @@ -646,7 +646,7 @@
@ -16413,7 +16416,7 @@ Subject: Source
} }
} }
}; };
diff --git a/Toolbox/ScriptMgr/ScriptMgrInit.a b/Toolbox/ScriptMgr/ScriptMgrInit.a
--- a/Toolbox/ScriptMgr/ScriptMgrInit.a --- a/Toolbox/ScriptMgr/ScriptMgrInit.a
+++ b/Toolbox/ScriptMgr/ScriptMgrInit.a +++ b/Toolbox/ScriptMgr/ScriptMgrInit.a
@@ -13,28 +13,6 @@ @@ -13,28 +13,6 @@
@ -16654,7 +16657,7 @@ Subject: Source
dc.w CharByte - romanDispTable ; CharByte (16) dc.w CharByte - romanDispTable ; CharByte (16)
dc.w CharType - romanDispTable ; CharType (18) <26> dc.w CharType - romanDispTable ; CharType (18) <26>
dc.w Pixel2Char - romanDispTable ; Pixel2Char (20) dc.w Pixel2Char - romanDispTable ; Pixel2Char (20)
diff --git a/Toolbox/ScriptMgr/ScriptMgrMisc.a b/Toolbox/ScriptMgr/ScriptMgrMisc.a
--- a/Toolbox/ScriptMgr/ScriptMgrMisc.a --- a/Toolbox/ScriptMgr/ScriptMgrMisc.a
+++ b/Toolbox/ScriptMgr/ScriptMgrMisc.a +++ b/Toolbox/ScriptMgr/ScriptMgrMisc.a
@@ -12,9 +12,6 @@ @@ -12,9 +12,6 @@
@ -16729,7 +16732,7 @@ Subject: Source
endproc endproc
; ---------------------------------------------------------------------------- ; ----------------------------------------------------------------------------
diff --git a/Toolbox/ScriptMgr/ScriptMgrUtilDate.a b/Toolbox/ScriptMgr/ScriptMgrUtilDate.a
--- a/Toolbox/ScriptMgr/ScriptMgrUtilDate.a --- a/Toolbox/ScriptMgr/ScriptMgrUtilDate.a
+++ b/Toolbox/ScriptMgr/ScriptMgrUtilDate.a +++ b/Toolbox/ScriptMgr/ScriptMgrUtilDate.a
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
@ -16837,7 +16840,7 @@ Subject: Source
CheckSelector CheckSelector
link a6,#localFrame link a6,#localFrame
diff --git a/Toolbox/ShutDownMgr/ShutDownMgr.a b/Toolbox/ShutDownMgr/ShutDownMgr.a
--- a/Toolbox/ShutDownMgr/ShutDownMgr.a --- a/Toolbox/ShutDownMgr/ShutDownMgr.a
+++ b/Toolbox/ShutDownMgr/ShutDownMgr.a +++ b/Toolbox/ShutDownMgr/ShutDownMgr.a
@@ -20,9 +20,6 @@ @@ -20,9 +20,6 @@
@ -17006,7 +17009,7 @@ Subject: Source
MOVE.L A6,-(SP) ; push address of grafPort MOVE.L A6,-(SP) ; push address of grafPort
_InitPort ; initialize the port. This particular case _InitPort ; initialize the port. This particular case
; doesnt move memory, even when it calls COPYRGN! ; doesnt move memory, even when it calls COPYRGN!
diff --git a/Toolbox/WindowMgr/StandardWDEF.a b/Toolbox/WindowMgr/StandardWDEF.a
--- a/Toolbox/WindowMgr/StandardWDEF.a --- a/Toolbox/WindowMgr/StandardWDEF.a
+++ b/Toolbox/WindowMgr/StandardWDEF.a +++ b/Toolbox/WindowMgr/StandardWDEF.a
@@ -446,7 +446,7 @@ IsNoZoom @@ -446,7 +446,7 @@ IsNoZoom
@ -17048,7 +17051,7 @@ Subject: Source
_GetResource ; look in ROM first <SM3> rb _GetResource ; look in ROM first <SM3> rb
move.l (SP)+, A0 ; pixels handle move.l (SP)+, A0 ; pixels handle
_HLock ; dont want it to move _HLock ; dont want it to move
diff --git a/Toolbox/WindowMgr/WindowList.a b/Toolbox/WindowMgr/WindowList.a
--- a/Toolbox/WindowMgr/WindowList.a --- a/Toolbox/WindowMgr/WindowList.a
+++ b/Toolbox/WindowMgr/WindowList.a +++ b/Toolbox/WindowMgr/WindowList.a
@@ -258,7 +258,7 @@ DoOld MOVE.L (SP)+, A1 @@ -258,7 +258,7 @@ DoOld MOVE.L (SP)+, A1
@ -17060,7 +17063,7 @@ Subject: Source
IMPORT BringToFrontGuts IMPORT BringToFrontGuts
LEA BringToFrontGuts, A0 LEA BringToFrontGuts, A0
IMPORT TwoByFour IMPORT TwoByFour
diff --git a/Toolbox/WindowMgr/WindowMgrPatches.a b/Toolbox/WindowMgr/WindowMgrPatches.a
--- a/Toolbox/WindowMgr/WindowMgrPatches.a --- a/Toolbox/WindowMgr/WindowMgrPatches.a
+++ b/Toolbox/WindowMgr/WindowMgrPatches.a +++ b/Toolbox/WindowMgr/WindowMgrPatches.a
@@ -516,6 +516,20 @@ ShowHideActivatePalette PatchProc _ShowHide,(II) @@ -516,6 +516,20 @@ ShowHideActivatePalette PatchProc _ShowHide,(II)
@ -17111,7 +17114,8 @@ Subject: Source
;———————————————————————————————————————————————————————————————————————————————————————————————————— ;————————————————————————————————————————————————————————————————————————————————————————————————————
__NewWindow PatchProc _NewWindow __NewWindow PatchProc _NewWindow
diff --git a/TrashTalk.a b/TrashTalk.a
new file mode 100644
--- /dev/null --- /dev/null
+++ b/TrashTalk.a +++ b/TrashTalk.a
@@ -0,0 +1,259 @@ @@ -0,0 +1,259 @@
@ -17374,7 +17378,8 @@ Subject: Source
+ +
+ +
+ END + END
diff --git a/TrashTalk.a.idump b/TrashTalk.a.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/TrashTalk.a.idump +++ b/TrashTalk.a.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@

View File

@ -2,6 +2,7 @@ From: Horst Beepmanh <>
Subject: MPW Tools Subject: MPW Tools
--- ---
diff --git a/DeclData/DeclData.make b/DeclData/DeclData.make
--- a/DeclData/DeclData.make --- a/DeclData/DeclData.make
+++ b/DeclData/DeclData.make +++ b/DeclData/DeclData.make
@@ -59,8 +59,8 @@ DeclHeaders = "{ObjDir}StandardEqu.d" ∂ @@ -59,8 +59,8 @@ DeclHeaders = "{ObjDir}StandardEqu.d" ∂
@ -15,7 +16,7 @@ Subject: MPW Tools
"{RsrcDir}DeclData.rsrc" ƒ "{RIncludes}Types.r" ∂ "{RsrcDir}DeclData.rsrc" ƒ "{RIncludes}Types.r" ∂
diff --git a/Make/FeatureList b/Make/FeatureList
--- a/Make/FeatureList --- a/Make/FeatureList
+++ b/Make/FeatureList +++ b/Make/FeatureList
@@ -197,11 +197,11 @@ Set AvailableFeatures "hasROMGibbly ∂ @@ -197,11 +197,11 @@ Set AvailableFeatures "hasROMGibbly ∂
@ -34,13 +35,17 @@ Subject: MPW Tools
For Override in {2} For Override in {2}
diff --git a/Tools/Make b/Tools/Make
new file mode 100644
diff --git a/Tools/Make.idump b/Tools/Make.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/Make.idump +++ b/Tools/Make.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+MPSTMPS +MPSTMPS
\ No newline at end of file \ No newline at end of file
diff --git a/Tools/Make.rdump b/Tools/Make.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/Make.rdump +++ b/Tools/Make.rdump
@@ -0,0 +1,8481 @@ @@ -0,0 +1,8481 @@
@ -8525,13 +8530,17 @@ Subject: MPW Tools
+ $"0000 0000 0000 0000" /* ........ */ + $"0000 0000 0000 0000" /* ........ */
+}; +};
+ +
diff --git a/Tools/RomLayout b/Tools/RomLayout
new file mode 100644
diff --git a/Tools/RomLayout.idump b/Tools/RomLayout.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/RomLayout.idump +++ b/Tools/RomLayout.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+MPST???? +MPST????
\ No newline at end of file \ No newline at end of file
diff --git a/Tools/RomLayout.rdump b/Tools/RomLayout.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/RomLayout.rdump +++ b/Tools/RomLayout.rdump
@@ -0,0 +1,1493 @@ @@ -0,0 +1,1493 @@
@ -10028,13 +10037,17 @@ Subject: MPW Tools
+ $"0008 3F3C 000E A9F0 0000 0000 0000 0000" /* ..?<............ */ + $"0008 3F3C 000E A9F0 0000 0000 0000 0000" /* ..?<............ */
+}; +};
+ +
diff --git a/Tools/RomLink b/Tools/RomLink
new file mode 100644
diff --git a/Tools/RomLink.idump b/Tools/RomLink.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/RomLink.idump +++ b/Tools/RomLink.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+MPST???? +MPST????
\ No newline at end of file \ No newline at end of file
diff --git a/Tools/RomLink.rdump b/Tools/RomLink.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/RomLink.rdump +++ b/Tools/RomLink.rdump
@@ -0,0 +1,1461 @@ @@ -0,0 +1,1461 @@
@ -11499,13 +11512,17 @@ Subject: MPW Tools
+ $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
+}; +};
+ +
diff --git a/Tools/Vectorize b/Tools/Vectorize
new file mode 100644
diff --git a/Tools/Vectorize.idump b/Tools/Vectorize.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/Vectorize.idump +++ b/Tools/Vectorize.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+MPST???? +MPST????
\ No newline at end of file \ No newline at end of file
diff --git a/Tools/Vectorize.rdump b/Tools/Vectorize.rdump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Tools/Vectorize.rdump +++ b/Tools/Vectorize.rdump
@@ -0,0 +1,1973 @@ @@ -0,0 +1,1973 @@

View File

@ -2,6 +2,7 @@ From: Horst Beepmanh <>
Subject: Makefile fixes Subject: Makefile fixes
--- ---
diff --git a/Drivers/Drivers.make b/Drivers/Drivers.make
--- a/Drivers/Drivers.make --- a/Drivers/Drivers.make
+++ b/Drivers/Drivers.make +++ b/Drivers/Drivers.make
@@ -22,9 +22,6 @@ BackLightDir = {DriverDir}BackLight: @@ -22,9 +22,6 @@ BackLightDir = {DriverDir}BackLight:
@ -14,7 +15,7 @@ Subject: Makefile fixes
#include {NewAgeDir}NewAge.make #include {NewAgeDir}NewAge.make
#include {IOPDir}IOP.make #include {IOPDir}IOP.make
diff --git a/Make/DBLite.make b/Make/DBLite.make
--- a/Make/DBLite.make --- a/Make/DBLite.make
+++ b/Make/DBLite.make +++ b/Make/DBLite.make
@@ -254,7 +254,7 @@ Clean ƒ @@ -254,7 +254,7 @@ Clean ƒ
@ -34,7 +35,7 @@ Subject: Makefile fixes
- -
#include {ResourceDir}Resources.make #include {ResourceDir}Resources.make
diff --git a/Make/LC930.make b/Make/LC930.make
--- a/Make/LC930.make --- a/Make/LC930.make
+++ b/Make/LC930.make +++ b/Make/LC930.make
@@ -236,12 +236,10 @@ Clean ƒ @@ -236,12 +236,10 @@ Clean ƒ
@ -51,7 +52,7 @@ Subject: Makefile fixes
-#include {DriverDir}Drivers.make -#include {DriverDir}Drivers.make
- -
#include {ResourceDir}Resources.make #include {ResourceDir}Resources.make
diff --git a/Make/RISC.make b/Make/RISC.make
--- a/Make/RISC.make --- a/Make/RISC.make
+++ b/Make/RISC.make +++ b/Make/RISC.make
@@ -379,12 +379,10 @@ Clean ƒ @@ -379,12 +379,10 @@ Clean ƒ
@ -68,7 +69,7 @@ Subject: Makefile fixes
-#include {DriverDir}Drivers.make -#include {DriverDir}Drivers.make
- -
#include {ResourceDir}Resources.make #include {ResourceDir}Resources.make
diff --git a/Make/Universal.make b/Make/Universal.make
--- a/Make/Universal.make --- a/Make/Universal.make
+++ b/Make/Universal.make +++ b/Make/Universal.make
@@ -367,12 +367,10 @@ Clean ƒ @@ -367,12 +367,10 @@ Clean ƒ
@ -85,7 +86,7 @@ Subject: Makefile fixes
-#include {DriverDir}Drivers.make -#include {DriverDir}Drivers.make
- -
#include {ResourceDir}Resources.make #include {ResourceDir}Resources.make
diff --git a/OS/MemoryMgr/MemoryMgr.make b/OS/MemoryMgr/MemoryMgr.make
--- a/OS/MemoryMgr/MemoryMgr.make --- a/OS/MemoryMgr/MemoryMgr.make
+++ b/OS/MemoryMgr/MemoryMgr.make +++ b/OS/MemoryMgr/MemoryMgr.make
@@ -17,15 +17,15 @@ @@ -17,15 +17,15 @@
@ -107,7 +108,7 @@ Subject: Makefile fixes
"{LibDir}MemoryMgr.lib" ƒ "{LibDir}Figment.lib" {MemoryMgrObjs} "{LibDir}MemoryMgr.lib" ƒ "{LibDir}Figment.lib" {MemoryMgrObjs}
If "{FeatureSet}" =~ /≈'hasNewHeapMgr=True'≈/ If "{FeatureSet}" =~ /≈'hasNewHeapMgr=True'≈/
Lib {StdLibOpts} -o "{Targ}" "{LibDir}Figment.lib" {MemoryMgrObjs} Lib {StdLibOpts} -o "{Targ}" "{LibDir}Figment.lib" {MemoryMgrObjs}
diff --git a/OS/OS.make b/OS/OS.make
--- a/OS/OS.make --- a/OS/OS.make
+++ b/OS/OS.make +++ b/OS/OS.make
@@ -67,14 +67,12 @@ RealTimeDir = {OSDir}RealTime: @@ -67,14 +67,12 @@ RealTimeDir = {OSDir}RealTime:
@ -125,7 +126,8 @@ Subject: Makefile fixes
OSObjs = "{ObjDir}clock.a.o" ∂ OSObjs = "{ObjDir}clock.a.o" ∂
diff --git a/Toolbox/Toolbox.make b/Toolbox/Toolbox.make
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Toolbox/Toolbox.make +++ b/Toolbox/Toolbox.make
@@ -0,0 +1,110 @@ @@ -0,0 +1,110 @@
@ -239,7 +241,8 @@ Subject: Makefile fixes
+ "{AIncludes}PrPrivate.a" ∂ + "{AIncludes}PrPrivate.a" ∂
+ "{PrintingDir}PrintGlue.a" + "{PrintingDir}PrintGlue.a"
+ Asm {StdAOpts} -o "{Targ}" "{PrintingDir}PrintGlue.a" + Asm {StdAOpts} -o "{Targ}" "{PrintingDir}PrintGlue.a"
diff --git a/Toolbox/Toolbox.make.idump b/Toolbox/Toolbox.make.idump
new file mode 100644
--- /dev/null --- /dev/null
+++ b/Toolbox/Toolbox.make.idump +++ b/Toolbox/Toolbox.make.idump
@@ -0,0 +1 @@ @@ -0,0 +1 @@

View File

@ -2,6 +2,7 @@ From: Horst Beepmanh <>
Subject: Update C compiler Subject: Update C compiler
--- ---
diff --git a/Tools/C.rdump b/Tools/C.rdump
--- a/Tools/C.rdump --- a/Tools/C.rdump
+++ b/Tools/C.rdump +++ b/Tools/C.rdump
@@ -1,1539 +1,800 @@ @@ -1,1539 +1,800 @@

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff