From 3a2915361843f034e9c27fcf25e0488e0ff6c90e Mon Sep 17 00:00:00 2001 From: Elliot Nunn Date: Fri, 12 Jul 2019 20:27:53 +0800 Subject: [PATCH] Preserve original include-file case names This is a hack to prevent git from choking on case-insensitive filesystems. These files are affected (old cases): Assert.h CType.h DisAsmLookUp.h ErrNo.h FCntl.h Float.h IOCtl.h Limits.h Locale.h Math.h Perf.h SetJmp.h Signal.h StdArg.h StdDef.h StdIO.h StdLib.h String.h Time.h Values.h DisAsmLookUp.p --- ...-interfaces-3.4.1-excluding-assembly.patch | 7430 ++++++----------- 1 file changed, 2498 insertions(+), 4932 deletions(-) diff --git a/patchset/Custer/5-universal-interfaces-3.4.1-excluding-assembly.patch b/patchset/Custer/5-universal-interfaces-3.4.1-excluding-assembly.patch index 16a8e46..5a892d9 100644 --- a/patchset/Custer/5-universal-interfaces-3.4.1-excluding-assembly.patch +++ b/patchset/Custer/5-universal-interfaces-3.4.1-excluding-assembly.patch @@ -1881,9 +1881,9 @@ new file mode 100644 + +#endif /* __AEDATAMODEL__ */ + -diff --git a/Interfaces/CIncludes/Assert.h.idump b/Interfaces/CIncludes/AEDataModel.h.idump +diff --git a/Interfaces/CIncludes/CIncludes Release Notes.idump b/Interfaces/CIncludes/AEDataModel.h.idump similarity index 100% -rename from Interfaces/CIncludes/Assert.h.idump +rename from Interfaces/CIncludes/CIncludes Release Notes.idump rename to Interfaces/CIncludes/AEDataModel.h.idump diff --git a/Interfaces/CIncludes/AEDataModel.h.rdump b/Interfaces/CIncludes/AEDataModel.h.rdump new file mode 100644 @@ -2488,9 +2488,9 @@ new file mode 100644 + +#endif /* __AEHELPERS__ */ + -diff --git a/Interfaces/CIncludes/CIncludes Release Notes.idump b/Interfaces/CIncludes/AEHelpers.h.idump +diff --git a/Interfaces/CIncludes/DBDMA.h.idump b/Interfaces/CIncludes/AEHelpers.h.idump similarity index 100% -rename from Interfaces/CIncludes/CIncludes Release Notes.idump +rename from Interfaces/CIncludes/DBDMA.h.idump rename to Interfaces/CIncludes/AEHelpers.h.idump diff --git a/Interfaces/CIncludes/AEHelpers.h.rdump b/Interfaces/CIncludes/AEHelpers.h.rdump new file mode 100644 @@ -2930,9 +2930,9 @@ new file mode 100644 + +#endif /* __AEINTERACTION__ */ + -diff --git a/Interfaces/CIncludes/CType.h.idump b/Interfaces/CIncludes/AEInteraction.h.idump +diff --git a/Interfaces/CIncludes/DateTime.h.idump b/Interfaces/CIncludes/AEInteraction.h.idump similarity index 100% -rename from Interfaces/CIncludes/CType.h.idump +rename from Interfaces/CIncludes/DateTime.h.idump rename to Interfaces/CIncludes/AEInteraction.h.idump diff --git a/Interfaces/CIncludes/AEInteraction.h.rdump b/Interfaces/CIncludes/AEInteraction.h.rdump new file mode 100644 @@ -3154,9 +3154,9 @@ new file mode 100644 + +#endif /* __AEMACH__ */ + -diff --git a/Interfaces/CIncludes/DBDMA.h.idump b/Interfaces/CIncludes/AEMach.h.idump +diff --git a/Interfaces/CIncludes/EndianAware.h.idump b/Interfaces/CIncludes/AEMach.h.idump similarity index 100% -rename from Interfaces/CIncludes/DBDMA.h.idump +rename from Interfaces/CIncludes/EndianAware.h.idump rename to Interfaces/CIncludes/AEMach.h.idump diff --git a/Interfaces/CIncludes/AEMach.h.rdump b/Interfaces/CIncludes/AEMach.h.rdump new file mode 100644 @@ -4003,9 +4003,9 @@ new file mode 100644 + +#endif /* __AEOBJECTS__ */ + -diff --git a/Interfaces/CIncludes/DateTime.h.idump b/Interfaces/CIncludes/AEObjects.h.idump +diff --git a/Interfaces/CIncludes/Graf3D.h.idump b/Interfaces/CIncludes/AEObjects.h.idump similarity index 100% -rename from Interfaces/CIncludes/DateTime.h.idump +rename from Interfaces/CIncludes/Graf3D.h.idump rename to Interfaces/CIncludes/AEObjects.h.idump diff --git a/Interfaces/CIncludes/AEObjects.h.rdump b/Interfaces/CIncludes/AEObjects.h.rdump new file mode 100644 @@ -4180,9 +4180,9 @@ new file mode 100644 + +#endif /* __AEPACKOBJECT__ */ + -diff --git a/Interfaces/CIncludes/DisAsmLookUp.h.idump b/Interfaces/CIncludes/AEPackObject.h.idump +diff --git a/Interfaces/CIncludes/M68K.h.idump b/Interfaces/CIncludes/AEPackObject.h.idump similarity index 100% -rename from Interfaces/CIncludes/DisAsmLookUp.h.idump +rename from Interfaces/CIncludes/M68K.h.idump rename to Interfaces/CIncludes/AEPackObject.h.idump diff --git a/Interfaces/CIncludes/AEPackObject.h.rdump b/Interfaces/CIncludes/AEPackObject.h.rdump new file mode 100644 @@ -5262,9 +5262,9 @@ new file mode 100644 + +#endif /* __AEREGISTRY__ */ + -diff --git a/Interfaces/CIncludes/EndianAware.h.idump b/Interfaces/CIncludes/AERegistry.h.idump +diff --git a/Interfaces/CIncludes/Palette.h.idump b/Interfaces/CIncludes/AERegistry.h.idump similarity index 100% -rename from Interfaces/CIncludes/EndianAware.h.idump +rename from Interfaces/CIncludes/Palette.h.idump rename to Interfaces/CIncludes/AERegistry.h.idump diff --git a/Interfaces/CIncludes/AERegistry.h.rdump b/Interfaces/CIncludes/AERegistry.h.rdump new file mode 100644 @@ -5420,9 +5420,9 @@ new file mode 100644 + +#endif /* __AEUSERTERMTYPES__ */ + -diff --git a/Interfaces/CIncludes/ErrNo.h.idump b/Interfaces/CIncludes/AEUserTermTypes.h.idump +diff --git a/Interfaces/CIncludes/PrintTraps.h.idump b/Interfaces/CIncludes/AEUserTermTypes.h.idump similarity index 100% -rename from Interfaces/CIncludes/ErrNo.h.idump +rename from Interfaces/CIncludes/PrintTraps.h.idump rename to Interfaces/CIncludes/AEUserTermTypes.h.idump diff --git a/Interfaces/CIncludes/AEUserTermTypes.h.rdump b/Interfaces/CIncludes/AEUserTermTypes.h.rdump new file mode 100644 @@ -5688,9 +5688,9 @@ new file mode 100644 + +#endif /* __AIFF__ */ + -diff --git a/Interfaces/CIncludes/FCntl.h.idump b/Interfaces/CIncludes/AIFF.h.idump +diff --git a/Interfaces/CIncludes/QTComponents.h.idump b/Interfaces/CIncludes/AIFF.h.idump similarity index 100% -rename from Interfaces/CIncludes/FCntl.h.idump +rename from Interfaces/CIncludes/QTComponents.h.idump rename to Interfaces/CIncludes/AIFF.h.idump diff --git a/Interfaces/CIncludes/AIFF.h.rdump b/Interfaces/CIncludes/AIFF.h.rdump new file mode 100644 @@ -6069,9 +6069,9 @@ new file mode 100644 + +#endif /* __ASDEBUGGING__ */ + -diff --git a/Interfaces/CIncludes/Float.h.idump b/Interfaces/CIncludes/ASDebugging.h.idump +diff --git a/Interfaces/CIncludes/ROMFastTraps.h.idump b/Interfaces/CIncludes/ASDebugging.h.idump similarity index 100% -rename from Interfaces/CIncludes/Float.h.idump +rename from Interfaces/CIncludes/ROMFastTraps.h.idump rename to Interfaces/CIncludes/ASDebugging.h.idump diff --git a/Interfaces/CIncludes/ASDebugging.h.rdump b/Interfaces/CIncludes/ASDebugging.h.rdump new file mode 100644 @@ -6461,9 +6461,9 @@ new file mode 100644 + +#endif /* __ASREGISTRY__ */ + -diff --git a/Interfaces/CIncludes/Graf3D.h.idump b/Interfaces/CIncludes/ASRegistry.h.idump +diff --git a/Interfaces/CIncludes/SANE.h.idump b/Interfaces/CIncludes/ASRegistry.h.idump similarity index 100% -rename from Interfaces/CIncludes/Graf3D.h.idump +rename from Interfaces/CIncludes/SANE.h.idump rename to Interfaces/CIncludes/ASRegistry.h.idump diff --git a/Interfaces/CIncludes/ASRegistry.h.rdump b/Interfaces/CIncludes/ASRegistry.h.rdump new file mode 100644 @@ -8085,9 +8085,9 @@ new file mode 100644 + +#endif /* __ATA__ */ + -diff --git a/Interfaces/CIncludes/IOCtl.h.idump b/Interfaces/CIncludes/ATA.h.idump +diff --git a/Interfaces/CIncludes/SCSIStandard.h.idump b/Interfaces/CIncludes/ATA.h.idump similarity index 100% -rename from Interfaces/CIncludes/IOCtl.h.idump +rename from Interfaces/CIncludes/SCSIStandard.h.idump rename to Interfaces/CIncludes/ATA.h.idump diff --git a/Interfaces/CIncludes/ATA.h.rdump b/Interfaces/CIncludes/ATA.h.rdump new file mode 100644 @@ -8766,9 +8766,9 @@ new file mode 100644 + +#endif /* __ATSFONT__ */ + -diff --git a/Interfaces/CIncludes/Limits.h.idump b/Interfaces/CIncludes/ATSFont.h.idump +diff --git a/Interfaces/CIncludes/SysEqu.h.idump b/Interfaces/CIncludes/ATSFont.h.idump similarity index 100% -rename from Interfaces/CIncludes/Limits.h.idump +rename from Interfaces/CIncludes/SysEqu.h.idump rename to Interfaces/CIncludes/ATSFont.h.idump diff --git a/Interfaces/CIncludes/ATSFont.h.rdump b/Interfaces/CIncludes/ATSFont.h.rdump new file mode 100644 @@ -8943,9 +8943,9 @@ new file mode 100644 + +#endif /* __ATSLAYOUTTYPES__ */ + -diff --git a/Interfaces/CIncludes/Locale.h.idump b/Interfaces/CIncludes/ATSLayoutTypes.h.idump +diff --git a/Interfaces/PInterfaces/Desk.p.idump b/Interfaces/CIncludes/ATSLayoutTypes.h.idump similarity index 100% -rename from Interfaces/CIncludes/Locale.h.idump +rename from Interfaces/PInterfaces/Desk.p.idump rename to Interfaces/CIncludes/ATSLayoutTypes.h.idump diff --git a/Interfaces/CIncludes/ATSLayoutTypes.h.rdump b/Interfaces/CIncludes/ATSLayoutTypes.h.rdump new file mode 100644 @@ -9332,9 +9332,9 @@ new file mode 100644 + +#endif /* __ATSTYPES__ */ + -diff --git a/Interfaces/CIncludes/M68K.h.idump b/Interfaces/CIncludes/ATSTypes.h.idump +diff --git a/Interfaces/PInterfaces/Graf3D.p.idump b/Interfaces/CIncludes/ATSTypes.h.idump similarity index 100% -rename from Interfaces/CIncludes/M68K.h.idump +rename from Interfaces/PInterfaces/Graf3D.p.idump rename to Interfaces/CIncludes/ATSTypes.h.idump diff --git a/Interfaces/CIncludes/ATSTypes.h.rdump b/Interfaces/CIncludes/ATSTypes.h.rdump new file mode 100644 @@ -12375,9 +12375,9 @@ new file mode 100644 + +#endif /* __ATSUNICODE__ */ + -diff --git a/Interfaces/CIncludes/Math.h.idump b/Interfaces/CIncludes/ATSUnicode.h.idump +diff --git a/Interfaces/PInterfaces/Language.p.idump b/Interfaces/CIncludes/ATSUnicode.h.idump similarity index 100% -rename from Interfaces/CIncludes/Math.h.idump +rename from Interfaces/PInterfaces/Language.p.idump rename to Interfaces/CIncludes/ATSUnicode.h.idump diff --git a/Interfaces/CIncludes/ATSUnicode.h.rdump b/Interfaces/CIncludes/ATSUnicode.h.rdump new file mode 100644 @@ -13660,9 +13660,9 @@ new file mode 100644 + +#endif /* __AVCOMPONENTS__ */ + -diff --git a/Interfaces/CIncludes/Palette.h.idump b/Interfaces/CIncludes/AVComponents.h.idump +diff --git a/Interfaces/PInterfaces/MacPrint.p.idump b/Interfaces/CIncludes/AVComponents.h.idump similarity index 100% -rename from Interfaces/CIncludes/Palette.h.idump +rename from Interfaces/PInterfaces/MacPrint.p.idump rename to Interfaces/CIncludes/AVComponents.h.idump diff --git a/Interfaces/CIncludes/AVComponents.h.rdump b/Interfaces/CIncludes/AVComponents.h.rdump new file mode 100644 @@ -14351,9 +14351,9 @@ new file mode 100644 + +#endif /* __AVLTREE__ */ + -diff --git a/Interfaces/CIncludes/Perf.h.idump b/Interfaces/CIncludes/AVLTree.h.idump +diff --git a/Interfaces/PInterfaces/MemTypes.p.idump b/Interfaces/CIncludes/AVLTree.h.idump similarity index 100% -rename from Interfaces/CIncludes/Perf.h.idump +rename from Interfaces/PInterfaces/MemTypes.p.idump rename to Interfaces/CIncludes/AVLTree.h.idump diff --git a/Interfaces/CIncludes/AVLTree.h.rdump b/Interfaces/CIncludes/AVLTree.h.rdump new file mode 100644 @@ -18670,9 +18670,9 @@ new file mode 100644 + +#endif /* __APPEARANCE__ */ + -diff --git a/Interfaces/CIncludes/PrintTraps.h.idump b/Interfaces/CIncludes/Appearance.h.idump +diff --git a/Interfaces/PInterfaces/OSEvents.p.idump b/Interfaces/CIncludes/Appearance.h.idump similarity index 100% -rename from Interfaces/CIncludes/PrintTraps.h.idump +rename from Interfaces/PInterfaces/OSEvents.p.idump rename to Interfaces/CIncludes/Appearance.h.idump diff --git a/Interfaces/CIncludes/Appearance.h.rdump b/Interfaces/CIncludes/Appearance.h.rdump new file mode 100644 @@ -18865,9 +18865,9 @@ new file mode 100644 + +#endif /* __APPLEDISKPARTITIONS__ */ + -diff --git a/Interfaces/CIncludes/QTComponents.h.idump b/Interfaces/CIncludes/AppleDiskPartitions.h.idump +diff --git a/Interfaces/PInterfaces/OSIntf.p.idump b/Interfaces/CIncludes/AppleDiskPartitions.h.idump similarity index 100% -rename from Interfaces/CIncludes/QTComponents.h.idump +rename from Interfaces/PInterfaces/OSIntf.p.idump rename to Interfaces/CIncludes/AppleDiskPartitions.h.idump diff --git a/Interfaces/CIncludes/AppleDiskPartitions.h.rdump b/Interfaces/CIncludes/AppleDiskPartitions.h.rdump new file mode 100644 @@ -20968,9 +20968,9 @@ new file mode 100644 + +#endif /* __APPLEGUIDE__ */ + -diff --git a/Interfaces/CIncludes/ROMFastTraps.h.idump b/Interfaces/CIncludes/AppleGuide.h.idump +diff --git a/Interfaces/PInterfaces/PInterfaces Release Notes.idump b/Interfaces/CIncludes/AppleGuide.h.idump similarity index 100% -rename from Interfaces/CIncludes/ROMFastTraps.h.idump +rename from Interfaces/PInterfaces/PInterfaces Release Notes.idump rename to Interfaces/CIncludes/AppleGuide.h.idump diff --git a/Interfaces/CIncludes/AppleGuide.h.rdump b/Interfaces/CIncludes/AppleGuide.h.rdump new file mode 100644 @@ -21257,9 +21257,9 @@ new file mode 100644 + +#endif /* __APPLEHELP__ */ + -diff --git a/Interfaces/CIncludes/SANE.h.idump b/Interfaces/CIncludes/AppleHelp.h.idump +diff --git a/Interfaces/PInterfaces/PackIntf.p.idump b/Interfaces/CIncludes/AppleHelp.h.idump similarity index 100% -rename from Interfaces/CIncludes/SANE.h.idump +rename from Interfaces/PInterfaces/PackIntf.p.idump rename to Interfaces/CIncludes/AppleHelp.h.idump diff --git a/Interfaces/CIncludes/AppleHelp.h.rdump b/Interfaces/CIncludes/AppleHelp.h.rdump new file mode 100644 @@ -21532,9 +21532,9 @@ new file mode 100644 + +#endif /* __APPLESCRIPT__ */ + -diff --git a/Interfaces/CIncludes/SCSIStandard.h.idump b/Interfaces/CIncludes/AppleScript.h.idump +diff --git a/Interfaces/PInterfaces/PaletteMgr.p.idump b/Interfaces/CIncludes/AppleScript.h.idump similarity index 100% -rename from Interfaces/CIncludes/SCSIStandard.h.idump +rename from Interfaces/PInterfaces/PaletteMgr.p.idump rename to Interfaces/CIncludes/AppleScript.h.idump diff --git a/Interfaces/CIncludes/AppleScript.h.rdump b/Interfaces/CIncludes/AppleScript.h.rdump new file mode 100644 @@ -25455,9 +25455,9 @@ new file mode 100644 + +#endif /* __APPLICATIONSERVICES__ */ + -diff --git a/Interfaces/CIncludes/SetJmp.h.idump b/Interfaces/CIncludes/ApplicationServices.h.idump +diff --git a/Interfaces/PInterfaces/Picker.p.idump b/Interfaces/CIncludes/ApplicationServices.h.idump similarity index 100% -rename from Interfaces/CIncludes/SetJmp.h.idump +rename from Interfaces/PInterfaces/Picker.p.idump rename to Interfaces/CIncludes/ApplicationServices.h.idump diff --git a/Interfaces/CIncludes/ApplicationServices.h.rdump b/Interfaces/CIncludes/ApplicationServices.h.rdump new file mode 100644 @@ -25478,35 +25478,34 @@ new file mode 100644 +}; + diff --git a/Interfaces/CIncludes/Assert.h b/Interfaces/CIncludes/Assert.h -deleted file mode 100644 --- a/Interfaces/CIncludes/Assert.h -+++ /dev/null -@@ -1,39 +0,0 @@ --/************************************************************ -- -- Assert.h -- Diagnostics -- ++++ b/Interfaces/CIncludes/Assert.h +@@ -3,37 +3,38 @@ + Assert.h + Diagnostics + - Copyright © Apple Computer,Inc. 1987-1991. -- All Rights Reserved. ++ Copyright © Apple Computer,Inc. 1987-1990, 1994,1995. + All Rights Reserved. - This file is used in these builds: ROM System -- + - - Change History (most recent first): - - <4> 8/8/91 JL Update copyright - - To Do: --************************************************************/ -- --#undef assert -- --#ifdef NDEBUG -- + ************************************************************/ + + #undef assert + + #ifdef NDEBUG + -#define assert(ignore) ((void) 0) -- --#else -- ++ #define assert(ignore) ((void) 0) + + #else + -#ifdef __cplusplus -extern "C" { -#endif @@ -25514,31 +25513,54 @@ deleted file mode 100644 -#ifdef __cplusplus -} -#endif -- ++ #if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++ #endif ++ ++ #ifdef __cplusplus ++ extern "C" { ++ #endif + -#define assert(expression) \ - ( (expression) ? (void) 0 : (__assertprint(__FILE__, __LINE__, #expression)) ) - -#endif -- -- ++ void __assertprint(const char* file, int line, const char* expr); + ++ #ifdef __cplusplus ++ } ++ #endif ++ ++ #define assert(expression) \ ++ ( (expression) ? (void) 0 : (__assertprint(__FILE__, __LINE__, #expression)) ) + ++ #if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off ++ #endif ++ ++#endif diff --git a/Interfaces/CIncludes/Assert.h.rdump b/Interfaces/CIncludes/Assert.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/Assert.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/Assert.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 007B 434C 6962 7261" /* ..Monaco.{CLibra */ -- $"7269 6573 7D43 5341 4E45 4C69 622E 6F20" /* ries}CSANELib.o */ ++ $"0009 4D6F 6E61 636F 007B 434C 066C F8A0" /* ..Monaco.{CL.l.. */ + $"7269 6573 7D43 5341 4E45 4C69 622E 6F20" /* ries}CSANELib.o */ - $"B60D 0006 0004 002C 0002 01E0 0244 002C" /* .......,.....D., */ - $"0002 01E0 0244 A4C7 1261 0000 00CE 0000" /* .....D...a...... */ - $"00CE 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"B60D 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"002C 0002 01E0 0244 002C 0002 01E0 0244" /* .,.....D.,.....D */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"CE1B B597 3FE5 3230 0004 0000 0000 0000" /* ....?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -25550,8 +25572,18 @@ deleted file mode 100644 - $"6972 7374 2043 6865 636B 496E 2028 5265" /* irst CheckIn (Re */ - $"7669 7369 6F6E 2034 2066 726F 6D20 5265" /* vision 4 from Re */ - $"616C 6974 7929 2E00" /* ality).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/Balloons.h b/Interfaces/CIncludes/Balloons.h --- a/Interfaces/CIncludes/Balloons.h +++ b/Interfaces/CIncludes/Balloons.h @@ -27717,9 +27749,9 @@ new file mode 100644 + +#endif /* __CFARRAY__ */ + -diff --git a/Interfaces/CIncludes/Signal.h.idump b/Interfaces/CIncludes/CFArray.h.idump +diff --git a/Interfaces/PInterfaces/PickerIntf.p.idump b/Interfaces/CIncludes/CFArray.h.idump similarity index 100% -rename from Interfaces/CIncludes/Signal.h.idump +rename from Interfaces/PInterfaces/PickerIntf.p.idump rename to Interfaces/CIncludes/CFArray.h.idump diff --git a/Interfaces/CIncludes/CFArray.h.rdump b/Interfaces/CIncludes/CFArray.h.rdump new file mode 100644 @@ -28084,9 +28116,9 @@ new file mode 100644 + +#endif /* __CFBAG__ */ + -diff --git a/Interfaces/CIncludes/StdArg.h.idump b/Interfaces/CIncludes/CFBag.h.idump +diff --git a/Interfaces/PInterfaces/PictUtil.p.idump b/Interfaces/CIncludes/CFBag.h.idump similarity index 100% -rename from Interfaces/CIncludes/StdArg.h.idump +rename from Interfaces/PInterfaces/PictUtil.p.idump rename to Interfaces/CIncludes/CFBag.h.idump diff --git a/Interfaces/CIncludes/CFBag.h.rdump b/Interfaces/CIncludes/CFBag.h.rdump new file mode 100644 @@ -28651,9 +28683,9 @@ new file mode 100644 + +#endif /* __CFBASE__ */ + -diff --git a/Interfaces/CIncludes/StdDef.h.idump b/Interfaces/CIncludes/CFBase.h.idump +diff --git a/Interfaces/PInterfaces/PrintTraps.p.idump b/Interfaces/CIncludes/CFBase.h.idump similarity index 100% -rename from Interfaces/CIncludes/StdDef.h.idump +rename from Interfaces/PInterfaces/PrintTraps.p.idump rename to Interfaces/CIncludes/CFBase.h.idump diff --git a/Interfaces/CIncludes/CFBase.h.rdump b/Interfaces/CIncludes/CFBase.h.rdump new file mode 100644 @@ -29469,9 +29501,9 @@ new file mode 100644 + +#endif /* __CFBUNDLE__ */ + -diff --git a/Interfaces/CIncludes/StdIO.h.idump b/Interfaces/CIncludes/CFBundle.h.idump +diff --git a/Interfaces/PInterfaces/SANE.p.idump b/Interfaces/CIncludes/CFBundle.h.idump similarity index 100% -rename from Interfaces/CIncludes/StdIO.h.idump +rename from Interfaces/PInterfaces/SANE.p.idump rename to Interfaces/CIncludes/CFBundle.h.idump diff --git a/Interfaces/CIncludes/CFBundle.h.rdump b/Interfaces/CIncludes/CFBundle.h.rdump new file mode 100644 @@ -29832,9 +29864,9 @@ new file mode 100644 + +#endif /* __CFCHARACTERSET__ */ + -diff --git a/Interfaces/CIncludes/StdLib.h.idump b/Interfaces/CIncludes/CFCharacterSet.h.idump +diff --git a/Interfaces/PInterfaces/SCSIIntf.p.idump b/Interfaces/CIncludes/CFCharacterSet.h.idump similarity index 100% -rename from Interfaces/CIncludes/StdLib.h.idump +rename from Interfaces/PInterfaces/SCSIIntf.p.idump rename to Interfaces/CIncludes/CFCharacterSet.h.idump diff --git a/Interfaces/CIncludes/CFCharacterSet.h.rdump b/Interfaces/CIncludes/CFCharacterSet.h.rdump new file mode 100644 @@ -30139,9 +30171,9 @@ new file mode 100644 + +#endif /* __CFDATA__ */ + -diff --git a/Interfaces/CIncludes/String.h.idump b/Interfaces/CIncludes/CFData.h.idump +diff --git a/Interfaces/PInterfaces/SysEqu.p.idump b/Interfaces/CIncludes/CFData.h.idump similarity index 100% -rename from Interfaces/CIncludes/String.h.idump +rename from Interfaces/PInterfaces/SysEqu.p.idump rename to Interfaces/CIncludes/CFData.h.idump diff --git a/Interfaces/CIncludes/CFData.h.rdump b/Interfaces/CIncludes/CFData.h.rdump new file mode 100644 @@ -30507,9 +30539,9 @@ new file mode 100644 + +#endif /* __CFDATE__ */ + -diff --git a/Interfaces/CIncludes/SysEqu.h.idump b/Interfaces/CIncludes/CFDate.h.idump +diff --git a/Interfaces/PInterfaces/ToolIntf.p.idump b/Interfaces/CIncludes/CFDate.h.idump similarity index 100% -rename from Interfaces/CIncludes/SysEqu.h.idump +rename from Interfaces/PInterfaces/ToolIntf.p.idump rename to Interfaces/CIncludes/CFDate.h.idump diff --git a/Interfaces/CIncludes/CFDate.h.rdump b/Interfaces/CIncludes/CFDate.h.rdump new file mode 100644 @@ -31680,9 +31712,9 @@ new file mode 100644 + +#endif /* __CFDICTIONARY__ */ + -diff --git a/Interfaces/CIncludes/Time.h.idump b/Interfaces/CIncludes/CFDictionary.h.idump +diff --git a/Interfaces/PInterfaces/VideoIntf.p.idump b/Interfaces/CIncludes/CFDictionary.h.idump similarity index 100% -rename from Interfaces/CIncludes/Time.h.idump +rename from Interfaces/PInterfaces/VideoIntf.p.idump rename to Interfaces/CIncludes/CFDictionary.h.idump diff --git a/Interfaces/CIncludes/CFDictionary.h.rdump b/Interfaces/CIncludes/CFDictionary.h.rdump new file mode 100644 @@ -32027,9 +32059,9 @@ new file mode 100644 + +#endif /* __CFNUMBER__ */ + -diff --git a/Interfaces/CIncludes/Values.h.idump b/Interfaces/CIncludes/CFNumber.h.idump +diff --git a/Interfaces/RIncludes/GestaltEqu.h.idump b/Interfaces/CIncludes/CFNumber.h.idump similarity index 100% -rename from Interfaces/CIncludes/Values.h.idump +rename from Interfaces/RIncludes/GestaltEqu.h.idump rename to Interfaces/CIncludes/CFNumber.h.idump diff --git a/Interfaces/CIncludes/CFNumber.h.rdump b/Interfaces/CIncludes/CFNumber.h.rdump new file mode 100644 @@ -32492,9 +32524,9 @@ new file mode 100644 + +#endif /* __CFPLUGIN__ */ + -diff --git a/Interfaces/PInterfaces/Desk.p.idump b/Interfaces/CIncludes/CFPlugIn.h.idump +diff --git a/Interfaces/RIncludes/RIncludes Release Notes.idump b/Interfaces/CIncludes/CFPlugIn.h.idump similarity index 100% -rename from Interfaces/PInterfaces/Desk.p.idump +rename from Interfaces/RIncludes/RIncludes Release Notes.idump rename to Interfaces/CIncludes/CFPlugIn.h.idump diff --git a/Interfaces/CIncludes/CFPlugIn.h.rdump b/Interfaces/CIncludes/CFPlugIn.h.rdump new file mode 100644 @@ -32651,10 +32683,13 @@ new file mode 100644 + +#endif /* __CFPLUGINCOM__ */ + -diff --git a/Interfaces/PInterfaces/DisAsmLookUp.p.idump b/Interfaces/CIncludes/CFPlugInCOM.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/DisAsmLookUp.p.idump -rename to Interfaces/CIncludes/CFPlugInCOM.h.idump +diff --git a/Interfaces/CIncludes/CFPlugInCOM.h.idump b/Interfaces/CIncludes/CFPlugInCOM.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFPlugInCOM.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFPlugInCOM.h.rdump b/Interfaces/CIncludes/CFPlugInCOM.h.rdump new file mode 100644 --- /dev/null @@ -33063,10 +33098,13 @@ new file mode 100644 + +#endif /* __CFPREFERENCES__ */ + -diff --git a/Interfaces/PInterfaces/Graf3D.p.idump b/Interfaces/CIncludes/CFPreferences.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/Graf3D.p.idump -rename to Interfaces/CIncludes/CFPreferences.h.idump +diff --git a/Interfaces/CIncludes/CFPreferences.h.idump b/Interfaces/CIncludes/CFPreferences.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFPreferences.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFPreferences.h.rdump b/Interfaces/CIncludes/CFPreferences.h.rdump new file mode 100644 --- /dev/null @@ -33274,10 +33312,13 @@ new file mode 100644 + +#endif /* __CFPROPERTYLIST__ */ + -diff --git a/Interfaces/PInterfaces/Language.p.idump b/Interfaces/CIncludes/CFPropertyList.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/Language.p.idump -rename to Interfaces/CIncludes/CFPropertyList.h.idump +diff --git a/Interfaces/CIncludes/CFPropertyList.h.idump b/Interfaces/CIncludes/CFPropertyList.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFPropertyList.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFPropertyList.h.rdump b/Interfaces/CIncludes/CFPropertyList.h.rdump new file mode 100644 --- /dev/null @@ -33641,10 +33682,13 @@ new file mode 100644 + +#endif /* __CFSET__ */ + -diff --git a/Interfaces/PInterfaces/MacPrint.p.idump b/Interfaces/CIncludes/CFSet.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/MacPrint.p.idump -rename to Interfaces/CIncludes/CFSet.h.idump +diff --git a/Interfaces/CIncludes/CFSet.h.idump b/Interfaces/CIncludes/CFSet.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFSet.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFSet.h.rdump b/Interfaces/CIncludes/CFSet.h.rdump new file mode 100644 --- /dev/null @@ -35121,10 +35165,13 @@ new file mode 100644 + +#endif /* __CFSTRING__ */ + -diff --git a/Interfaces/PInterfaces/MemTypes.p.idump b/Interfaces/CIncludes/CFString.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/MemTypes.p.idump -rename to Interfaces/CIncludes/CFString.h.idump +diff --git a/Interfaces/CIncludes/CFString.h.idump b/Interfaces/CIncludes/CFString.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFString.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFString.h.rdump b/Interfaces/CIncludes/CFString.h.rdump new file mode 100644 --- /dev/null @@ -35376,10 +35423,13 @@ new file mode 100644 + +#endif /* __CFSTRINGENCODINGEXT__ */ + -diff --git a/Interfaces/PInterfaces/OSEvents.p.idump b/Interfaces/CIncludes/CFStringEncodingExt.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/OSEvents.p.idump -rename to Interfaces/CIncludes/CFStringEncodingExt.h.idump +diff --git a/Interfaces/CIncludes/CFStringEncodingExt.h.idump b/Interfaces/CIncludes/CFStringEncodingExt.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFStringEncodingExt.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFStringEncodingExt.h.rdump b/Interfaces/CIncludes/CFStringEncodingExt.h.rdump new file mode 100644 --- /dev/null @@ -35705,10 +35755,13 @@ new file mode 100644 + +#endif /* __CFTIMEZONE__ */ + -diff --git a/Interfaces/PInterfaces/OSIntf.p.idump b/Interfaces/CIncludes/CFTimeZone.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/OSIntf.p.idump -rename to Interfaces/CIncludes/CFTimeZone.h.idump +diff --git a/Interfaces/CIncludes/CFTimeZone.h.idump b/Interfaces/CIncludes/CFTimeZone.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFTimeZone.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFTimeZone.h.rdump b/Interfaces/CIncludes/CFTimeZone.h.rdump new file mode 100644 --- /dev/null @@ -36055,10 +36108,13 @@ new file mode 100644 + +#endif /* __CFTREE__ */ + -diff --git a/Interfaces/PInterfaces/PInterfaces Release Notes.idump b/Interfaces/CIncludes/CFTree.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/PInterfaces Release Notes.idump -rename to Interfaces/CIncludes/CFTree.h.idump +diff --git a/Interfaces/CIncludes/CFTree.h.idump b/Interfaces/CIncludes/CFTree.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFTree.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFTree.h.rdump b/Interfaces/CIncludes/CFTree.h.rdump new file mode 100644 --- /dev/null @@ -36834,10 +36890,13 @@ new file mode 100644 + +#endif /* __CFURL__ */ + -diff --git a/Interfaces/PInterfaces/PackIntf.p.idump b/Interfaces/CIncludes/CFURL.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/PackIntf.p.idump -rename to Interfaces/CIncludes/CFURL.h.idump +diff --git a/Interfaces/CIncludes/CFURL.h.idump b/Interfaces/CIncludes/CFURL.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFURL.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFURL.h.rdump b/Interfaces/CIncludes/CFURL.h.rdump new file mode 100644 --- /dev/null @@ -37163,10 +37222,13 @@ new file mode 100644 + +#endif /* __CFURLACCESS__ */ + -diff --git a/Interfaces/PInterfaces/PaletteMgr.p.idump b/Interfaces/CIncludes/CFURLAccess.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/PaletteMgr.p.idump -rename to Interfaces/CIncludes/CFURLAccess.h.idump +diff --git a/Interfaces/CIncludes/CFURLAccess.h.idump b/Interfaces/CIncludes/CFURLAccess.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFURLAccess.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFURLAccess.h.rdump b/Interfaces/CIncludes/CFURLAccess.h.rdump new file mode 100644 --- /dev/null @@ -37427,10 +37489,13 @@ new file mode 100644 + +#endif /* __CFUUID__ */ + -diff --git a/Interfaces/PInterfaces/Picker.p.idump b/Interfaces/CIncludes/CFUUID.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/Picker.p.idump -rename to Interfaces/CIncludes/CFUUID.h.idump +diff --git a/Interfaces/CIncludes/CFUUID.h.idump b/Interfaces/CIncludes/CFUUID.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFUUID.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFUUID.h.rdump b/Interfaces/CIncludes/CFUUID.h.rdump new file mode 100644 --- /dev/null @@ -37815,10 +37880,13 @@ new file mode 100644 + +#endif /* __CFXMLNODE__ */ + -diff --git a/Interfaces/PInterfaces/PickerIntf.p.idump b/Interfaces/CIncludes/CFXMLNode.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/PickerIntf.p.idump -rename to Interfaces/CIncludes/CFXMLNode.h.idump +diff --git a/Interfaces/CIncludes/CFXMLNode.h.idump b/Interfaces/CIncludes/CFXMLNode.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFXMLNode.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFXMLNode.h.rdump b/Interfaces/CIncludes/CFXMLNode.h.rdump new file mode 100644 --- /dev/null @@ -38348,10 +38416,13 @@ new file mode 100644 + +#endif /* __CFXMLPARSER__ */ + -diff --git a/Interfaces/PInterfaces/PictUtil.p.idump b/Interfaces/CIncludes/CFXMLParser.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/PictUtil.p.idump -rename to Interfaces/CIncludes/CFXMLParser.h.idump +diff --git a/Interfaces/CIncludes/CFXMLParser.h.idump b/Interfaces/CIncludes/CFXMLParser.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CFXMLParser.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CFXMLParser.h.rdump b/Interfaces/CIncludes/CFXMLParser.h.rdump new file mode 100644 --- /dev/null @@ -38679,10 +38750,13 @@ new file mode 100644 + +#endif /* __CGAFFINETRANSFORM__ */ + -diff --git a/Interfaces/PInterfaces/PrintTraps.p.idump b/Interfaces/CIncludes/CGAffineTransform.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/PrintTraps.p.idump -rename to Interfaces/CIncludes/CGAffineTransform.h.idump +diff --git a/Interfaces/CIncludes/CGAffineTransform.h.idump b/Interfaces/CIncludes/CGAffineTransform.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CGAffineTransform.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CGAffineTransform.h.rdump b/Interfaces/CIncludes/CGAffineTransform.h.rdump new file mode 100644 --- /dev/null @@ -38800,10 +38874,13 @@ new file mode 100644 + +#endif /* __CGBASE__ */ + -diff --git a/Interfaces/PInterfaces/SANE.p.idump b/Interfaces/CIncludes/CGBase.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/SANE.p.idump -rename to Interfaces/CIncludes/CGBase.h.idump +diff --git a/Interfaces/CIncludes/CGBase.h.idump b/Interfaces/CIncludes/CGBase.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CGBase.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CGBase.h.rdump b/Interfaces/CIncludes/CGBase.h.rdump new file mode 100644 --- /dev/null @@ -38929,10 +39006,13 @@ new file mode 100644 + +#endif /* __CGBITMAPCONTEXT__ */ + -diff --git a/Interfaces/PInterfaces/SCSIIntf.p.idump b/Interfaces/CIncludes/CGBitmapContext.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/SCSIIntf.p.idump -rename to Interfaces/CIncludes/CGBitmapContext.h.idump +diff --git a/Interfaces/CIncludes/CGBitmapContext.h.idump b/Interfaces/CIncludes/CGBitmapContext.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CGBitmapContext.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CGBitmapContext.h.rdump b/Interfaces/CIncludes/CGBitmapContext.h.rdump new file mode 100644 --- /dev/null @@ -39300,10 +39380,13 @@ new file mode 100644 + +#endif /* __CGCOLORSPACE__ */ + -diff --git a/Interfaces/PInterfaces/SysEqu.p.idump b/Interfaces/CIncludes/CGColorSpace.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/SysEqu.p.idump -rename to Interfaces/CIncludes/CGColorSpace.h.idump +diff --git a/Interfaces/CIncludes/CGColorSpace.h.idump b/Interfaces/CIncludes/CGColorSpace.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CGColorSpace.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CGColorSpace.h.rdump b/Interfaces/CIncludes/CGColorSpace.h.rdump new file mode 100644 --- /dev/null @@ -40805,10 +40888,13 @@ new file mode 100644 + +#endif /* __CGCONTEXT__ */ + -diff --git a/Interfaces/PInterfaces/ToolIntf.p.idump b/Interfaces/CIncludes/CGContext.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/ToolIntf.p.idump -rename to Interfaces/CIncludes/CGContext.h.idump +diff --git a/Interfaces/CIncludes/CGContext.h.idump b/Interfaces/CIncludes/CGContext.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CGContext.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CGContext.h.rdump b/Interfaces/CIncludes/CGContext.h.rdump new file mode 100644 --- /dev/null @@ -40973,10 +41059,13 @@ new file mode 100644 + +#endif /* __CGDATACONSUMER__ */ + -diff --git a/Interfaces/PInterfaces/VideoIntf.p.idump b/Interfaces/CIncludes/CGDataConsumer.h.idump -similarity index 100% -rename from Interfaces/PInterfaces/VideoIntf.p.idump -rename to Interfaces/CIncludes/CGDataConsumer.h.idump +diff --git a/Interfaces/CIncludes/CGDataConsumer.h.idump b/Interfaces/CIncludes/CGDataConsumer.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CGDataConsumer.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CGDataConsumer.h.rdump b/Interfaces/CIncludes/CGDataConsumer.h.rdump new file mode 100644 --- /dev/null @@ -41205,10 +41294,13 @@ new file mode 100644 + +#endif /* __CGDATAPROVIDER__ */ + -diff --git a/Interfaces/RIncludes/GestaltEqu.h.idump b/Interfaces/CIncludes/CGDataProvider.h.idump -similarity index 100% -rename from Interfaces/RIncludes/GestaltEqu.h.idump -rename to Interfaces/CIncludes/CGDataProvider.h.idump +diff --git a/Interfaces/CIncludes/CGDataProvider.h.idump b/Interfaces/CIncludes/CGDataProvider.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CGDataProvider.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CGDataProvider.h.rdump b/Interfaces/CIncludes/CGDataProvider.h.rdump new file mode 100644 --- /dev/null @@ -42162,10 +42254,13 @@ new file mode 100644 + +#endif /* __CGDIRECTDISPLAY__ */ + -diff --git a/Interfaces/RIncludes/RIncludes Release Notes.idump b/Interfaces/CIncludes/CGDirectDisplay.h.idump -similarity index 100% -rename from Interfaces/RIncludes/RIncludes Release Notes.idump -rename to Interfaces/CIncludes/CGDirectDisplay.h.idump +diff --git a/Interfaces/CIncludes/CGDirectDisplay.h.idump b/Interfaces/CIncludes/CGDirectDisplay.h.idump +new file mode 100644 +--- /dev/null ++++ b/Interfaces/CIncludes/CGDirectDisplay.h.idump +@@ -0,0 +1 @@ ++TEXTMPS +\ No newline at end of file diff --git a/Interfaces/CIncludes/CGDirectDisplay.h.rdump b/Interfaces/CIncludes/CGDirectDisplay.h.rdump new file mode 100644 --- /dev/null @@ -53968,32 +54063,35 @@ diff --git a/Interfaces/CIncludes/CTBUtilities.h.rdump b/Interfaces/CIncludes/CT }; diff --git a/Interfaces/CIncludes/CType.h b/Interfaces/CIncludes/CType.h -deleted file mode 100644 --- a/Interfaces/CIncludes/CType.h -+++ /dev/null -@@ -1,82 +0,0 @@ --/************************************************************ -- ++++ b/Interfaces/CIncludes/CType.h +@@ -1,82 +1,104 @@ + /************************************************************ + - CType.h - Character handling - - Copyright American Telephone & Telegraph - Used with permission, Apple Computer Inc. 1985-1991. - This file is used in these builds: ROM System -- ++ ctype.h ++ Testing and mapping character values. + - All Rights Reserved. -- ++ Copyright Apple Computer,Inc. 1995 ++ All rights reserved + - Change History (most recent first): - - <4> 8/8/91 JL Update copyright - - To Do: --************************************************************/ -- -- --#ifndef __CTYPE__ --#define __CTYPE__ -- + ************************************************************/ + + + #ifndef __CTYPE__ + #define __CTYPE__ + -/* @(#)ctype.h 2.1 */ -/* 3.0 SID # 1.2 */ -#define _U 01 @@ -54004,11 +54102,25 @@ deleted file mode 100644 -#define _C 040 -#define _B 0100 -#define _X 0200 -- ++#define _UPP (unsigned char)0x01 /* upper case */ ++#define _LOW (unsigned char)0x02 /* lower case */ ++#define _DIG (unsigned char)0x04 /* decimal digit */ ++#define _WSP (unsigned char)0x08 /* white space */ ++#define _PUN (unsigned char)0x10 /* punctuation */ ++#define _CTL (unsigned char)0x20 /* control */ ++#define _BLA (unsigned char)0x40 /* blank, ' ' */ ++#define _HEX (unsigned char)0x80 /* hex digit */ + -extern char * const __p_CType; -- ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif + -#ifdef __cplusplus --extern "C" { ++extern const char * __p_CType; ++ ++#if __cplusplus + extern "C" { -#endif - -int isalnum (int c); @@ -54050,28 +54162,102 @@ deleted file mode 100644 -#endif - -#ifdef __cplusplus --} --#endif -- ++#endif /* __cplusplus */ ++ ++extern int isalnum(int c); ++extern int isalpha(int c); ++extern int iscntrl(int c); ++extern int isdigit(int c); ++extern int isgraph(int c); ++extern int islower(int c); ++extern int isprint(int c); ++extern int ispunct(int c); ++extern int isspace(int c); ++extern int isupper(int c); ++extern int isxdigit(int c); ++extern int tolower(int c); ++extern int toupper(int c); ++ ++/* ++ * WARNING: These macros are not strictly ANSI compliant. They do not distinguish ++ * between EOF (-1) and 0xFF. However, since only the "C" locale is currently ++ * supported, and since in the "C" locale both EOF and 0xFF will fail all these ++ * tests, there is no pratical difference. ++ */ ++ ++#define isalnum(c) ((int)(__p_CType[(unsigned char)(c)] & (_UPP | _LOW | _DIG))) ++#define isalpha(c) ((int)(__p_CType[(unsigned char)(c)] & (_UPP | _LOW))) ++#define iscntrl(c) ((int)(__p_CType[(unsigned char)(c)] & _CTL)) ++#define isdigit(c) ((int)(__p_CType[(unsigned char)(c)] & _DIG)) ++#define isgraph(c) ((int)(__p_CType[(unsigned char)(c)] & (_UPP | _LOW | _DIG | _PUN))) ++#define islower(c) ((int)(__p_CType[(unsigned char)(c)] & _LOW)) ++#define isprint(c) ((int)(__p_CType[(unsigned char)(c)] & (_UPP | _LOW | _DIG | _PUN | _BLA))) ++#define ispunct(c) ((int)(__p_CType[(unsigned char)(c)] & _PUN)) ++#define isspace(c) ((int)(__p_CType[(unsigned char)(c)] & _WSP)) ++#define isupper(c) ((int)(__p_CType[(unsigned char)(c)] & _UPP)) ++#define isxdigit(c) ((int)(__p_CType[(unsigned char)(c)] & _HEX)) ++ ++/* ++ * Apple library extentions. The prefered mechanism for enabling these is by defining ++ * __useAppleExts__. In the absence of this symbol, the __STDC__ symbol is used to ++ * enable or disable these extentions. ++ */ ++ ++#if defined (__useAppleExts__) || \ ++ (defined (applec) && ! defined (__STDC__)) || \ ++ (defined (__PPCC__) && __STDC__ == 0) ++ ++ ++extern int isascii (int c); ++#define isascii(c) ((int)( (unsigned int) (c) <= (unsigned char)0x7F )) ++ ++/* ++ * WARNING: These macros are not strictly ANSI compliant. Strict compliance would ++ * require that, if "c" were not in the proper range, then the original value of ++ * "c" would be returned. It is the user's responsibility to ensure that "c" is ++ * in the proper range before using one of these two macros. ++ */ ++ ++#define __tolower(c) ((int)((unsigned char)(c) - (unsigned char)'A' + (unsigned char)'a')) ++#define __toupper(c) ((int)((unsigned char)(c) - (unsigned char)'a' + (unsigned char)'A')) ++ ++extern int toascii (int c); ++#define toascii(c) ((int)((unsigned char)(c) & (unsigned char)0x7F)) ++ ++#endif /* __useAppleExts__ */ ++ ++#if __cplusplus + } -#endif ++#endif /* __cplusplus */ + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off + #endif ++ ++#endif /* __CTYPE__ */ diff --git a/Interfaces/CIncludes/CType.h.rdump b/Interfaces/CIncludes/CType.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/CType.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/CType.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0039 3837 290D 0941" /* ..Monaco.987)..A */ -- $"6C6C 2072 6967 6874 7320 7265 7365 7276" /* ll rights reserv */ ++ $"0009 4D6F 6E61 636F 0039 3837 066D 0E90" /* ..Monaco.987.m.. */ + $"6C6C 2072 6967 6874 7320 7265 7365 7276" /* ll rights reserv */ - $"6564 0006 0004 002C 0002 01E0 0244 002C" /* ed.....,.....D., */ - $"0002 01E0 0244 A4C7 12D0 0000 00F1 0000" /* .....D.......... */ - $"00F1 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"6564 0006 0004 002A 0007 0156 01DD 002A" /* ed.....*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"002C 0002 01E0 0244 002C 0002 01E0 0244" /* .,.....D.,.....D */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"C6EB F4B3 3FE5 3230 0004 0000 0000 0000" /* ....?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -54083,8 +54269,18 @@ deleted file mode 100644 - $"7273 7420 4368 6563 6B49 6E20 2852 6576" /* rst CheckIn (Rev */ - $"6973 696F 6E20 3420 6672 6F6D 2052 6561" /* ision 4 from Rea */ - $"6C69 7479 292E 00" /* lity).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/Carbon.h b/Interfaces/CIncludes/Carbon.h new file mode 100644 --- /dev/null @@ -94884,12 +95080,12 @@ diff --git a/Interfaces/CIncludes/Dictionary.h.rdump b/Interfaces/CIncludes/Dict }; diff --git a/Interfaces/CIncludes/DisAsmLookUp.h b/Interfaces/CIncludes/DisAsmLookUp.h -deleted file mode 100644 --- a/Interfaces/CIncludes/DisAsmLookUp.h -+++ /dev/null -@@ -1,498 +0,0 @@ ++++ b/Interfaces/CIncludes/DisAsmLookUp.h +@@ -1,498 +1,7 @@ -/************************************************************ -- ++#include + -Created: Wednesday, November 1, 1989 - DisAsmLookup.h - C Interface to the Macintosh Libraries @@ -95277,7 +95473,9 @@ deleted file mode 100644 - A valid MacsBug symbol consists of the characters '_', '%', spaces, digits, and - upper/lower case letters in a format determined by the first two bytes of the - symbol as follows: -- ++/* ++ Yes, the Disassembler is now PowerMac Native. Cool, eh? + - 1st byte | 2nd byte | Byte | - Range | Range | Length | Comments - ============================================================================== @@ -95386,12 +95584,14 @@ deleted file mode 100644 -} -#endif -#endif ++ This file might Go Away in the future. ++*/ +\ No newline at end of file diff --git a/Interfaces/CIncludes/DisAsmLookUp.h.rdump b/Interfaces/CIncludes/DisAsmLookUp.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/DisAsmLookUp.h.rdump -+++ /dev/null -@@ -1,53 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/DisAsmLookUp.h.rdump +@@ -1,53 +1,28 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0020 2020 2020 2020" /* ..Monaco. */ - $"2020 2020 2020 2020 2020 2020 2020 2020" /* */ - $"2020 0006 0002 0029 0003 0141 01E3 0029" /* .....)...A...) */ @@ -95412,21 +95612,35 @@ deleted file mode 100644 - $"6E64 4F66 4D6F 6475 6C65 0000 549F 0000" /* ndOfModule..T... */ - $"54B0 1173 686F 774D 6163 7342 7567 5379" /* T..showMacsBugSy */ - $"6D62 6F6C" /* mbol */ --}; -- --data 'MPSR' (1008) { ++ $"0009 4D6F 6E61 636F 0000 0000 018C 9260" /* ..Monaco.......` */ ++ $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ ++ $"0000 0006 0004 003E 0004 02ED 0263 003E" /* .......>.....c.> */ ++ $"0004 02ED 0263 AC79 DE4D 0000 0000 0000" /* .....c.y.M...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"0029 0003 0141 01E3 0029 0003 0141 01E3" /* .)...A...)...A.. */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"003E 0004 02ED 0263 003E 0004 02ED 0263" /* .>.....c.>.....c */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'vers' (1, purgeable) { - $"0320 8000 0000 0533 2E32 2E30 2433 2E32" /* . .....3.2.0$3.2 */ - $"2E30 20A9 2041 7070 6C65 2043 6F6D 7075" /* .0 . Apple Compu */ - $"7465 722C 2049 6E63 2E20 3139 3835 2D39" /* ter, Inc. 1985-9 */ - $"31" /* 1 */ --}; -- --data 'vers' (2, purgeable) { ++data 'MWBB' (1008) { ++ $"0001 0001" /* .... */ ++}; ++ ++data 'vers' (1) { ++ $"0342 8000 0000 0533 2E34 2E32 2233 2E34" /* .B.....3.4.2"3.4 */ ++ $"2E32 2C20 A920 4170 706C 6520 436F 6D70" /* .2, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 36" /* uter, Inc. 1996 */ + }; + + data 'vers' (2, purgeable) { - $"0320 6006 0000 0533 2E32 6236 094D 5057" /* . `....3.2b6.MPW */ - $"2033 2E32 6236" /* 3.2b6 */ -}; @@ -95442,61 +95656,10 @@ deleted file mode 100644 - $"0000 0000 2846 6972 7374 2043 6865 636B" /* ....(First Check */ - $"496E 2028 5265 7669 7369 6F6E 2035 2066" /* In (Revision 5 f */ - $"726F 6D20 5265 616C 6974 7929 2E00" /* rom Reality).. */ --}; -- -diff --git a/Interfaces/CIncludes/DisAsmLookup.h b/Interfaces/CIncludes/DisAsmLookup.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/DisAsmLookup.h -@@ -0,0 +1,7 @@ -+#include -+ -+/* -+ Yes, the Disassembler is now PowerMac Native. Cool, eh? -+ -+ This file might Go Away in the future. -+*/ -\ No newline at end of file -diff --git a/Interfaces/CIncludes/DisAsmLookup.h.idump b/Interfaces/CIncludes/DisAsmLookup.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/DisAsmLookup.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/DisAsmLookup.h.rdump b/Interfaces/CIncludes/DisAsmLookup.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/DisAsmLookup.h.rdump -@@ -0,0 +1,28 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0000 0000 018C 9260" /* ..Monaco.......` */ -+ $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -+ $"0000 0006 0004 003E 0004 02ED 0263 003E" /* .......>.....c.> */ -+ $"0004 02ED 0263 AC79 DE4D 0000 0000 0000" /* .....c.y.M...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"003E 0004 02ED 0263 003E 0004 02ED 0263" /* .>.....c.>.....c */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'MWBB' (1008) { -+ $"0001 0001" /* .... */ -+}; -+ -+data 'vers' (1) { -+ $"0342 8000 0000 0533 2E34 2E32 2233 2E34" /* .B.....3.4.2"3.4 */ -+ $"2E32 2C20 A920 4170 706C 6520 436F 6D70" /* .2, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 36" /* uter, Inc. 1996 */ -+}; -+ -+data 'vers' (2, purgeable) { + $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ + $"2023 3233" /* #23 */ -+}; -+ + }; + diff --git a/Interfaces/CIncludes/Disassembler.h b/Interfaces/CIncludes/Disassembler.h new file mode 100644 --- /dev/null @@ -108267,35 +108430,52 @@ diff --git a/Interfaces/CIncludes/ErrMgr.h.rdump b/Interfaces/CIncludes/ErrMgr.h }; diff --git a/Interfaces/CIncludes/ErrNo.h b/Interfaces/CIncludes/ErrNo.h -deleted file mode 100644 --- a/Interfaces/CIncludes/ErrNo.h -+++ /dev/null -@@ -1,61 +0,0 @@ --/************************************************************ -- ++++ b/Interfaces/CIncludes/ErrNo.h +@@ -1,61 +1,76 @@ + /************************************************************ + - ErrNo.h - Error return codes - - Copyright American Telephone & Telegraph - Used with permission, Apple Computer Inc. 1985-1991 - This file is used in these builds: ROM System -- ++ errno.h ++ Error reporting macros + - All rights reserved -- ++ Copyright Apple Computer,Inc. 1995 ++ All rights reserved + - Change History (most recent first): -- ++ * Warning: Not all of these macros are a part of the ANSI C standard. ++ * This header is not POSIX compliant. ++ * The library functions are not guaranteed to set "errno" ++ * to the value of any of the non-ANSI macros. ++ * For portable code, do not use the non-ANSI macros. + - <4> 8/8/91 JL Update copyright - - To Do: -************************************************************/ -- -- --#ifndef __ERRNO__ --#define __ERRNO__ -- -- --extern int errno; -- ++ ************************************************************/ + + + #ifndef __ERRNO__ + #define __ERRNO__ + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif ++ ++/* ANSI specified declarations */ ++ ++#define EDOM 33 /* Argument outside function domain */ ++#define ERANGE 34 /* Result is too large to represent */ + + extern int errno; + -#define EPERM 1 /* Permission denied */ -#define ENOENT 2 /* No such file or directory */ -/* #define ENORSRC 3 No such resource */ @@ -108330,31 +108510,78 @@ deleted file mode 100644 -/* #define EPIPE 32 Broken pipe */ -#define EDOM 33 /* Math arg out of domain of func */ -#define ERANGE 34 /* Math result not representable */ -- --#endif ++/* Mac specific declaration */ + ++extern short MacOSErr; ++ ++/* Non-ANSI macro definitions */ ++ ++#define EPERM 1 /* Operation not permitted */ ++#define ENOENT 2 /* No such file or directory */ ++#define ENORSRC 3 /* No such process */ ++#define EINTR 4 /* Interrupted function call */ ++#define EIO 5 /* Input/Output error */ ++#define ENXIO 6 /* No such device or address */ ++#define E2BIG 7 /* Argument list too long */ ++#define ENOEXEC 8 /* File not in executable format */ ++#define EBADF 9 /* Bad file descriptor (or number) */ ++#define ECHILD 10 /* No child process */ ++#define EAGAIN 11 /* Resource temporarily unavailable */ ++#define ENOMEM 12 /* Not enough space */ ++#define EACCES 13 /* File access permission denied */ ++#define EFAULT 14 /* Bad address as argument in call */ ++#define ENOTBLK 15 /* For backward compatibility */ ++#define EBUSY 16 /* System resource busy */ ++#define EEXIST 17 /* File already exists */ ++#define EXDEV 18 /* Improper link attempted */ ++#define ENODEV 19 /* No such device */ ++#define ENOTDIR 20 /* Pathname was not a directory */ ++#define EISDIR 21 /* Attempt to open directory for write */ ++#define EINVAL 22 /* Invalid argument */ ++#define ENFILE 23 /* Too many open files in system */ ++#define EMFILE 24 /* Too many open files in process */ ++#define ENOTTY 25 /* Inappropriate I/O control operation */ ++#define ETXTBSY 26 /* Text file is busy */ ++#define EFBIG 27 /* File too large */ ++#define ENOSPC 28 /* No space left on device */ ++#define ESPIPE 29 /* Invalid seek */ ++#define EROFS 30 /* Attempt to modify a read-only file */ ++#define EMLINK 31 /* Too many links on a single file */ ++#define EPIPE 32 /* Broken pipe; no process to read it */ ++ ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off + #endif ++ ++#endif /* __ERRNO__ */ diff --git a/Interfaces/CIncludes/ErrNo.h.rdump b/Interfaces/CIncludes/ErrNo.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/ErrNo.h.rdump -+++ /dev/null -@@ -1,31 +0,0 @@ ++++ b/Interfaces/CIncludes/ErrNo.h.rdump +@@ -1,31 +1,25 @@ -data 'vers' (2, purgeable) { - $"0300 8000 0000 0333 2E30 094D 5057 2043" /* .......3.0.MPW C */ - $"2033 2E30" /* 3.0 */ -}; - --data 'MPSR' (1005) { + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0000 0000 0000 0000" /* ..Monaco........ */ -- $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ ++ $"0009 4D6F 6E61 636F 0000 0000 066C ACB0" /* ..Monaco.....l.. */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0006 0004 0038 001D 0270 0234 0038" /* .......8...p.4.8 */ - $"001D 0270 0234 A4C7 0FD1 0000 00F0 0000" /* ...p.4.......... */ - $"00F0 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"0000 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"0038 001D 0270 0234 0038 001D 0270 0234" /* .8...p.4.8...p.4 */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"BFD8 00D1 3FE5 3230 0004 0000 0000 0000" /* ....?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -108366,8 +108593,18 @@ deleted file mode 100644 - $"7273 7420 4368 6563 6B49 6E20 2852 6576" /* rst CheckIn (Rev */ - $"6973 696F 6E20 3420 6672 6F6D 2052 6561" /* ision 4 from Rea */ - $"6C69 7479 292E 00" /* lity).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/Errors.h b/Interfaces/CIncludes/Errors.h --- a/Interfaces/CIncludes/Errors.h +++ b/Interfaces/CIncludes/Errors.h @@ -110313,52 +110550,69 @@ diff --git a/Interfaces/CIncludes/Events.h.rdump b/Interfaces/CIncludes/Events.h }; diff --git a/Interfaces/CIncludes/FCntl.h b/Interfaces/CIncludes/FCntl.h -deleted file mode 100644 --- a/Interfaces/CIncludes/FCntl.h -+++ /dev/null -@@ -1,116 +0,0 @@ ++++ b/Interfaces/CIncludes/FCntl.h +@@ -1,116 +1,152 @@ -/* - * FCntl.h -- faccess(), fcntl(), and open() mode flags - * - * Portions copyright American Telephone & Telegraph - * Used with permission, Apple Computer Inc. (1985,1988,1990-1991) - * All rights reserved. -- ++/************************************************************ + - This file is used in these builds: ROM System -- ++ FCntl.h ++ faccess(), fcntl(), and open() mode flags. + - Change History (most recent first): -- ++ Copyright Apple Computer,Inc. 1995 ++ All rights reserved + - <6> 8/8/91 JL Update copyright - <5> 6/17/91 JL Checked in MPW 3.2ƒ version. Changed __safe_link to - __cplusplus. Changed comment for O_EXCL. -- ++ * Warning: This interface is NOT a part of the ANSI C standard. ++ * This header file is not POSIX compliant. ++ * For portable code, don't use this interface. ++ ++************************************************************/ + - To Do: - */ -- --#ifndef __FCNTL__ --#define __FCNTL__ -- --/* + + #ifndef __FCNTL__ + #define __FCNTL__ + ++ + /* - * For use by lseek(): -- */ -- ++ * Get common declarations + */ + -#ifndef __STDIO__ /* these defns exactly paralled in StdIO.h for fseek() */ -#define SEEK_CUR 1 -#define SEEK_END 2 -#define SEEK_SET 0 -#endif -- --/* -- * faccess() commands; for general use -- */ ++#include ++#include ++ + + /* + * faccess() commands; for general use + */ - /* 'd' => "directory" ops */ -#define F_DELETE (('d'<<8)|0x01) -#define F_RENAME (('d'<<8)|0x02) -- --/* -- * more faccess() commands; for use only by MPW tools -- */ -- ++ /* 'd' => "directory" ops */ ++#define F_DELETE (('d'<<8)|0x01) ++#define F_RENAME (('d'<<8)|0x02) + + /* + * more faccess() commands; for use only by MPW tools + */ + -#define F_OPEN (('d'<<8)|0x00) /* reserved for operating system use */ - /* 'e' => "editor" ops */ -#define F_GTABINFO (('e'<<8)|0x00) /* get tab offset for file */ @@ -110377,24 +110631,72 @@ deleted file mode 100644 -#define F_SMARKER (('e'<<8)|0x0C) /* Set " */ -#define F_GSAVEONCLOSE (('e'<<8)|0x0F) /* Get Save on close */ -#define F_SSAVEONCLOSE (('e'<<8)|0x0E) /* Set " " " */ -- --/* ++#define F_OPEN (('d'<<8)|0x00) /* reserved for operating system use */ ++ /* 'e' => "editor" ops */ ++#define F_GTABINFO (('e'<<8)|0x00) /* get tab offset for file */ ++#define F_STABINFO (('e'<<8)|0x01) /* set " " " " */ ++#define F_GFONTINFO (('e'<<8)|0x02) /* get font number and size for file */ ++#define F_SFONTINFO (('e'<<8)|0x03) /* set " " " " " " */ ++#define F_GPRINTREC (('e'<<8)|0x04) /* get print record for file */ ++#define F_SPRINTREC (('e'<<8)|0x05) /* set " " " " */ ++#define F_GSELINFO (('e'<<8)|0x06) /* get selection information for file */ ++#define F_SSELINFO (('e'<<8)|0x07) /* set " " " " */ ++#define F_GWININFO (('e'<<8)|0x08) /* get current window position */ ++#define F_SWININFO (('e'<<8)|0x09) /* set " " " */ ++#define F_GSCROLLINFO (('e'<<8)|0x0A) /* get scroll information */ ++#define F_SSCROLLINFO (('e'<<8)|0x0B) /* set " " */ ++#define F_GMARKER (('e'<<8)|0x0D) /* Get Marker */ ++#define F_SMARKER (('e'<<8)|0x0C) /* Set " */ ++#define F_GSAVEONCLOSE (('e'<<8)|0x0F) /* Get Save on close */ ++#define F_SSAVEONCLOSE (('e'<<8)|0x0E) /* Set " " " */ + + /* - * argument structure for use with F_SMARKER command -- */ --struct MarkElement { ++ * argument structure for use with F_SMARKER command + */ ++#ifdef powerc ++#pragma options align=mac68k ++#endif + struct MarkElement { - int start; /* start position of mark */ - int end; /* end position */ - unsigned char charCount; /* number of chars in mark name */ - char name[1]; /* first char of mark name */ - /* note: typically extra space is allocated */ -} ; /* in back to allow room for a longer string */ --#ifndef __cplusplus --typedef struct MarkElement MarkElement; --#endif -- --/* -- * Mode values accessible to open() -- */ ++ int start; /* start position of mark */ ++ int end; /* end position */ ++ unsigned char charCount; /* number of chars in mark name */ ++ char name[64]; /* marker name */ ++}; /* note: marker may be up to 64 chars long */ ++ ++#ifdef powerc ++#pragma options align=reset ++#endif ++ + #ifndef __cplusplus + typedef struct MarkElement MarkElement; + #endif + ++#ifdef powerc ++#pragma options align=mac68k ++#endif ++struct SelectionRecord { ++ long startingPos; ++ long endingPos; ++ long displayTop; ++}; ++#ifdef powerc ++#pragma options align=reset ++#endif ++#ifndef __cplusplus ++typedef struct SelectionRecord SelectionRecord; ++#endif ++ ++ + /* + * Mode values accessible to open() + */ -#define O_RDONLY 0 /* Bits 0 and 1 are used internally */ -#define O_WRONLY 1 /* Values 0..2 are historical */ -#define O_RDWR 2 /* NOTE: it goes 0, 1, 2, *!* 8, 16, 32, ... */ @@ -110406,12 +110708,41 @@ deleted file mode 100644 -#define O_BINARY (1<<11) /* Open as a binary stream */ - -#ifdef __cplusplus --extern "C" { ++ ++#define O_RDONLY 0x00 /* Open for reading only. */ ++#define O_WRONLY 0x01 /* Open for writing only. */ ++#define O_RDWR 0x02 /* Open for reading & writing. */ ++#define O_APPEND 0x08 /* Write to the end of the file. */ ++#define O_RSRC 0x10 /* Open the resource fork. */ ++#define O_ALIAS 0x20 /* Open alias file. */ ++#define O_CREAT 0x100 /* Open or create a file. */ ++#define O_TRUNC 0x200 /* Open and truncate to zero length. */ ++#define O_EXCL 0x400 /* Create file only; fail if exists. */ ++#define O_BINARY 0x800 /* Open as a binary stream. */ ++#define O_NRESOLVE 0x4000 /* Don't resolve any aliases. */ ++ ++/* ++ * fcntl() commands ++ */ ++#define F_DUPFD 0 /* Duplicate files (file descriptor) */ ++ ++ ++typedef int ssize_t; ++typedef long off_t; ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif ++ ++#if __cplusplus + extern "C" { -#endif -- --/* ++#endif /* __cplusplus */ + + /* - * function prototypes -- */ ++ * Input and Output Primitives + */ -int close(int); -int creat(const char*); -int dup(int filedes); /* OBSOLETE: fcntl(filedes, F_DUPFD, 0) is preferred */ @@ -110422,35 +110753,79 @@ deleted file mode 100644 -int read(int, char*, unsigned); -int unlink(char*); -int write(int, const char*, unsigned); -- + -#ifdef __cplusplus --} --#endif -- ++extern int open(const char *path, int oflag); ++extern int creat(const char *path); ++extern int unlink(const char *path); ++extern int faccess(const char *path, unsigned int cmd, long *arg); ++extern int dup(int fildes); /* OBSOLETE: fcntl(filedes, F_DUPFD, 0) is preferred. */ ++extern int close(int fildes); ++extern ssize_t read(int fildes, void *buf, size_t nbyte); ++extern ssize_t write(int fildes, const void *buf, size_t nbyte); ++extern int fcntl(int fildes, unsigned int cmd, int arg); ++extern off_t lseek(int fildes, off_t offset, int whence); ++ ++ ++#if __cplusplus + } ++#endif /* __cplusplus */ ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off + #endif + -/* - * fcntl() commands - */ -#define F_DUPFD 0 /* Duplicate files (file descriptor) */ - -#endif __FCNTL__ ++#endif /* __FCNTL__ */ diff --git a/Interfaces/CIncludes/FCntl.h.rdump b/Interfaces/CIncludes/FCntl.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/FCntl.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/FCntl.h.rdump +@@ -1,26 +1,47 @@ ++data 'MPSR' (1006) { ++ $"0003 0000 0048 0048 0000 0000 02DA 0228" /* .....H.H.......( */ ++ $"FFE1 FFE1 02F9 0245 0347 0528 03FC 0002" /* .......E.G.(.... */ ++ $"0000 0048 0048 0000 0000 02D8 0228 0001" /* ...H.H.......(.. */ ++ $"0000 0064 0000 0001 0003 0303 0000 0001" /* ...d............ */ ++ $"270F 0001 0001 0000 0000 0000 0000 0000" /* '............... */ ++ $"0000 6008 0019 0190 0000 0000 0000 0000" /* ..`............. */ ++ $"0000 0000 0000 0001 0000 0000 0000 0000" /* ................ */ ++ $"0000 0000 0000 0000" /* ........ */ ++}; ++ ++data 'MPSR' (10000) { ++ $"0101 FFFF FFFF FFFF 0000 0820 0101 0000" /* ........... .... */ ++ $"0000 0000 0000 0000 0000 0000" /* ............ */ ++}; ++ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 000D 202A 2050 6F72" /* ..Monaco.. * Por */ -- $"7469 6F6E 7320 636F 7079 7269 6768 7420" /* tions copyright */ ++ $"0009 4D6F 6E61 636F 000D 202A 066D 5B90" /* ..Monaco.. *.m[. */ + $"7469 6F6E 7320 636F 7079 7269 6768 7420" /* tions copyright */ - $"416D 0006 0004 0064 001C 0363 043D 0064" /* Am.....d...c.=.d */ - $"001C 0363 043D A4C7 0DE0 0000 00D3 0000" /* ...c.=.......... */ - $"0101 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"416D 0006 0004 002A 0007 0156 01DD 002A" /* Am.....*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ ++}; ++ ++data 'MPSR' (1007) { ++ $"0001 0000 016F 0000 016F 175F 5F63 6653" /* .....o...o.__cfS */ ++ $"656C 6563 7469 6F6E 4F6E 456E 7472 795F" /* electionOnEntry_ */ ++ $"5F00" /* _. */ + }; + + data 'MPSR' (1008) { - $"0064 001C 0363 043D 0064 001C 0363 043D" /* .d...c.=.d...c.= */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"BC01 00A2 3FE5 3230 0004 0000 0000 0000" /* ....?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -110462,8 +110837,18 @@ deleted file mode 100644 - $"7273 7420 4368 6563 6B49 6E20 2852 6576" /* rst CheckIn (Rev */ - $"6973 696F 6E20 3620 6672 6F6D 2052 6561" /* ision 6 from Rea */ - $"6C69 7479 292E 00" /* lity).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/FSM.h b/Interfaces/CIncludes/FSM.h new file mode 100644 --- /dev/null @@ -128811,107 +129196,117 @@ diff --git a/Interfaces/CIncludes/FixMath.h.rdump b/Interfaces/CIncludes/FixMath }; diff --git a/Interfaces/CIncludes/Float.h b/Interfaces/CIncludes/Float.h -deleted file mode 100644 --- a/Interfaces/CIncludes/Float.h -+++ /dev/null -@@ -1,78 +0,0 @@ --/************************************************************ -- -- Float.h -- Characteristics of floating-point types -- ++++ b/Interfaces/CIncludes/Float.h +@@ -3,16 +3,9 @@ + Float.h + Characteristics of floating-point types + - Copyright Apple Computer,Inc. 1987-1991 -- All rights reserved ++ Copyright Apple Computer,Inc. 1987-1990, 1993-1995 + All rights reserved - This file is used in these builds: ROM System -- + - - Change History (most recent first): - - <2> 8/8/91 JL Update copyright - - To Do: --************************************************************/ -- -- --#ifndef __FLOAT__ --#define __FLOAT__ -- -- --#define DBL_DIG 15 --#define DBL_MANT_DIG 53 --#define DBL_MAX_10_EXP 308 --#define DBL_MAX_EXP 1024 --#define DBL_MIN_10_EXP (-307) --#define DBL_MIN_EXP (-1021) -- --#define FLT_DIG 7 --#define FLT_MANT_DIG 24 --#define FLT_MAX_10_EXP 38 --#define FLT_MAX_EXP 128 --#define FLT_MIN_10_EXP (-37) --#define FLT_MIN_EXP (-125) -- --#define FLT_RADIX 2 --#define FLT_ROUNDS 1 -- + ************************************************************/ + + +@@ -37,12 +30,21 @@ + #define FLT_RADIX 2 + #define FLT_ROUNDS 1 + -#define LDBL_DIG 19 -#define LDBL_MANT_DIG 64 -#define LDBL_MAX_10_EXP 4932 -#define LDBL_MAX_EXP 16384 -#define LDBL_MIN_10_EXP (-4931) -#define LDBL_MIN_EXP (-16382) -- --#define DBL_EPSILON (*(double *)_DBL_EPSILON) --#define DBL_MAX (*(double *)_DBL_MAX) --#define DBL_MIN (*(double *)_DBL_MIN) --#define FLT_EPSILON (*(float *)_FLT_EPSILON) --#define FLT_MAX (*(float *)_FLT_MAX) --#define FLT_MIN (*(float *)_FLT_MIN) -- ++#ifdef powerc ++ #define LDBL_DIG 15 ++ #define LDBL_MANT_DIG 53 ++ #define LDBL_MAX_10_EXP 308 ++ #define LDBL_MAX_EXP 1024 ++ #define LDBL_MIN_10_EXP (-307) ++ #define LDBL_MIN_EXP (-1021) ++#else ++ #define LDBL_DIG 19 ++ #define LDBL_MANT_DIG 64 ++ #define LDBL_MAX_10_EXP 4932 ++ #define LDBL_MAX_EXP 16384 ++ #define LDBL_MIN_10_EXP (-4931) ++ #define LDBL_MIN_EXP (-16382) ++#endif + + #define DBL_EPSILON (*(double *)_DBL_EPSILON) + #define DBL_MAX (*(double *)_DBL_MAX) +@@ -51,18 +53,18 @@ + #define FLT_MAX (*(float *)_FLT_MAX) + #define FLT_MIN (*(float *)_FLT_MIN) + -#ifdef mc68881 - -#define LDBL_EPSILON (*(long double *)_LDBL_EPSILON) -#define LDBL_MAX (*(long double *)_LDBL_MAX) -#define LDBL_MIN (*(long double *)_LDBL_MIN) - --#else -- ++#if defined(mc68881) || defined(powerc) ++ #define LDBL_EPSILON (*(long double *)_LDBL_EPSILON) ++ #define LDBL_MAX (*(long double *)_LDBL_MAX) ++ #define LDBL_MIN (*(long double *)_LDBL_MIN) + #else ++ #define LDBL_EPSILON (*(long double *)(_LDBL_EPSILON+1)) ++ #define LDBL_MAX (*(long double *)(_LDBL_MAX+1)) ++ #define LDBL_MIN (*(long double *)(_LDBL_MIN+1)) ++#endif + -#define LDBL_EPSILON (*(long double *)(_LDBL_EPSILON+1)) -#define LDBL_MAX (*(long double *)(_LDBL_MAX+1)) -#define LDBL_MIN (*(long double *)(_LDBL_MIN+1)) - --#endif -- --extern int _DBL_EPSILON[]; --extern int _DBL_MAX[]; --extern int _DBL_MIN[]; --extern int _FLT_EPSILON[]; --extern int _FLT_MAX[]; --extern int _FLT_MIN[]; --extern short _LDBL_EPSILON[]; --extern short _LDBL_MAX[]; --extern short _LDBL_MIN[]; -- ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on + #endif + + extern int _DBL_EPSILON[]; +@@ -75,4 +77,8 @@ extern short _LDBL_EPSILON[]; + extern short _LDBL_MAX[]; + extern short _LDBL_MIN[]; + -#endif \ No newline at end of file ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off ++#endif ++ ++#endif diff --git a/Interfaces/CIncludes/Float.h.rdump b/Interfaces/CIncludes/Float.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/Float.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/Float.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0000 3F18 0000 3E40" /* ..Monaco..?...>@ */ - $"7465 6D20 466F 6C64 6572 3A43 6F6D 6D65" /* tem Folder:Comme */ - $"0000 0006 0004 0050 0020 0363 043D 0050" /* .......P. .c.=.P */ - $"0020 0363 043D A4C7 0CB8 0000 00E5 0000" /* . .c.=.......... */ - $"00E5 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"0009 4D6F 6E61 636F 003B 3B3B 066C F400" /* ..Monaco.;;;.l.. */ ++ $"3B3B 3B3B 3B3B 3B3B 3B3B 3B3B 3B3B 3B3B" /* ;;;;;;;;;;;;;;;; */ ++ $"3B3B 0006 0004 002A 0007 0156 01DD 002A" /* ;;.....*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"0050 0020 0363 043D 0050 0020 0363 043D" /* .P. .c.=.P. .c.= */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"BCF4 04CB 3FE5 3230 0004 0000 0000 0000" /* ....?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -128923,8 +129318,18 @@ deleted file mode 100644 - $"7273 7420 4368 6563 6B49 6E20 2852 6576" /* rst CheckIn (Rev */ - $"6973 696F 6E20 3220 6672 6F6D 2052 6561" /* ision 2 from Rea */ - $"6C69 7479 292E 00" /* lity).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/Folders.h b/Interfaces/CIncludes/Folders.h --- a/Interfaces/CIncludes/Folders.h +++ b/Interfaces/CIncludes/Folders.h @@ -155810,15 +156215,19 @@ new file mode 100644 +}; + diff --git a/Interfaces/CIncludes/IOCtl.h b/Interfaces/CIncludes/IOCtl.h -deleted file mode 100644 --- a/Interfaces/CIncludes/IOCtl.h -+++ /dev/null -@@ -1,62 +0,0 @@ --/* -- IOCtl.h -- Device-handler-specific requests -- ++++ b/Interfaces/CIncludes/IOCtl.h +@@ -1,23 +1,18 @@ + /* + IOCtl.h -- Device-handler-specific requests + - Copyright, Apple Computer Inc. 1985-1991 -- All rights reserved. ++ Warning: This interface is NOT a part of the ANSI C standard. ++ We do NOT claim to be POSIX compliant. ++ If you want your code to be portable, don't use this interface. ++ ++ Copyright, Apple Computer Inc. 1985-1991, 1995 + All rights reserved. - - This file is used in these builds: ROM System - @@ -155829,71 +156238,60 @@ deleted file mode 100644 - __cplusplus. - - To Do: --*/ -- --# ifndef __IOCTL__ --# define __IOCTL__ -- --/* -- * ioctl() function prototype -- */ -- --#ifdef __cplusplus --extern "C" { --#endif -- --int ioctl(int fildes, unsigned int cmd, long *arg); -- --#ifdef __cplusplus --} --#endif -- --/* -- * IO Control commands. -- * -- * IOCTLs which begin with "FIO" are controls which are general -- * (device driver) control requests. They may be executed by -- * the top-level ioctl() procedure, or previewed by it before -- * passing it on to the driver xxIoctl()s. -- */ -- --# define FIOLSEEK (('f'<<8)|0x00) /* Apple internal use only */ --# define FIODUPFD (('f'<<8)|0x01) /* Apple internal use only */ -- --# define FIOINTERACTIVE (('f'<<8)|0x02) /* If device is interactive */ --# define FIOBUFSIZE (('f'<<8)|0x03) /* Return optimal buffer size */ --# define FIOFNAME (('f'<<8)|0x04) /* Return filename */ --# define FIOREFNUM (('f'<<8)|0x05) /* Return fs refnum */ --# define FIOSETEOF (('f'<<8)|0x06) /* Set file length */ -- --/* -- * IOCTLs which begin with "TIO" are for TTY (i.e., console or -- * terminal-related) device control requests. -- */ -- --# define TIOFLUSH (('t'<<8)|0x00) /* discard unread input. arg is ignored */ --# define TIOSPORT (('t'<<8)|0x01) /* Obsolete -- do not use */ --# define TIOGPORT (('t'<<8)|0x02) /* Obsolete -- do not use */ -- + */ + + # ifndef __IOCTL__ + # define __IOCTL__ + ++ + /* + * ioctl() function prototype + */ +@@ -26,8 +21,16 @@ + extern "C" { + #endif + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif ++ + int ioctl(int fildes, unsigned int cmd, long *arg); + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off ++#endif ++ + #ifdef __cplusplus + } + #endif +@@ -59,4 +62,4 @@ int ioctl(int fildes, unsigned int cmd, long *arg); + # define TIOSPORT (('t'<<8)|0x01) /* Obsolete -- do not use */ + # define TIOGPORT (('t'<<8)|0x02) /* Obsolete -- do not use */ + -# endif __IOCTL__ ++# endif /*__IOCTL__*/ diff --git a/Interfaces/CIncludes/IOCtl.h.rdump b/Interfaces/CIncludes/IOCtl.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/IOCtl.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/IOCtl.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 001B 027F 7FFF 01DD" /* ..Monaco........ */ -- $"027E 027F 7FFF 01DE 027D 027E 7FFF 01DF" /* .~.......}.~.... */ ++ $"0009 4D6F 6E61 636F 001B 027F 066C E9C0" /* ..Monaco.....l.. */ + $"027E 027F 7FFF 01DE 027D 027E 7FFF 01DF" /* .~.......}.~.... */ - $"001B 0006 0004 002C 0002 01E0 0244 002C" /* .......,.....D., */ - $"0002 01E0 0244 A4C7 0B10 0000 0076 0000" /* .....D.......v.. */ - $"00A4 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"001B 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"002C 0002 01E0 0244 002C 0002 01E0 0244" /* .,.....D.,.....D */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"910E 03AE 3FE5 3230 0004 0000 0000 0000" /* ....?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -155905,8 +156303,18 @@ deleted file mode 100644 - $"7273 7420 4368 6563 6B49 6E20 2852 6576" /* rst CheckIn (Rev */ - $"6973 696F 6E20 3620 6672 6F6D 2052 6561" /* ision 6 from Rea */ - $"6C69 7479 292E 00" /* lity).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/Icons.h b/Interfaces/CIncludes/Icons.h --- a/Interfaces/CIncludes/Icons.h +++ b/Interfaces/CIncludes/Icons.h @@ -181322,65 +181730,85 @@ new file mode 100644 +}; + diff --git a/Interfaces/CIncludes/Limits.h b/Interfaces/CIncludes/Limits.h -deleted file mode 100644 --- a/Interfaces/CIncludes/Limits.h -+++ /dev/null -@@ -1,37 +0,0 @@ --/* -- Limits.h -- Sizes of integral types -- ++++ b/Interfaces/CIncludes/Limits.h +@@ -1,16 +1,9 @@ + /* + Limits.h -- Sizes of integral types + - Copyright Apple Computer,Inc. 1987, 1990-1991 -- All rights reserved. ++ Copyright Apple Computer,Inc. 1987, 1990, 1994-95 + All rights reserved. - This file is used in these builds: ROM System -- + - - Change History (most recent first): - - <2> 8/8/91 JL Update copyright - - To Do: --*/ -- --#ifndef __LIMITS__ --#define __LIMITS__ -- --#define CHAR_BIT 8 --#define CHAR_MAX 127 + */ + + #ifndef __LIMITS__ +@@ -18,12 +11,15 @@ + + #define CHAR_BIT 8 + #define CHAR_MAX 127 -#define CHAR_MIN (-128) --#define MB_LEN_MAX 1 --#define INT_MAX 2147483647 ++/* #define CHAR_MIN (-128) */ ++#define CHAR_MIN (-CHAR_MAX - 1) + #define MB_LEN_MAX 1 + #define INT_MAX 2147483647 -#define INT_MIN (-2147483648) --#define LONG_MAX 2147483647 ++/* #define INT_MIN (-2147483648) */ ++#define INT_MIN (-INT_MAX - 1) + #define LONG_MAX 2147483647 -#define LONG_MIN (-2147483648) --#define SCHAR_MAX 127 --#define SCHAR_MIN (-128) --#define SHRT_MAX 32767 --#define SHRT_MIN (-32768) --#define UCHAR_MAX 255U --#define UINT_MAX 4294967295U --#define ULONG_MAX 4294967295U ++/* #define LONG_MIN (-2147483648) */ ++#define LONG_MIN (-LONG_MAX - 1) + #define SCHAR_MAX 127 + #define SCHAR_MIN (-128) + #define SHRT_MAX 32767 +@@ -31,7 +27,15 @@ + #define UCHAR_MAX 255U + #define UINT_MAX 4294967295U + #define ULONG_MAX 4294967295U -#define USHRT_MAX 65535 -- -- --#endif ++#define USHRT_MAX 65535U ++ ++#if _LONG_LONG /* Is long long supported? */ ++ ++#define LLONG_MAX 9223372036854775807LL ++#define LLONG_MIN (-LLONG_MAX - 1) ++#define ULLONG_MAX 18446744073709551615ULL ++ ++#endif /* If _LONG_LONG is supported */ + + + #endif diff --git a/Interfaces/CIncludes/Limits.h.rdump b/Interfaces/CIncludes/Limits.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/Limits.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/Limits.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0072 7320 0000 02DC" /* ..Monaco.rs .... */ - $"2078 7878 0D0D 0943 6F70 7972 6967 6874" /* xxx...Copyright */ - $"0000 0006 0004 0050 0020 0363 043D 0050" /* .......P. .c.=.P */ - $"0020 0363 043D A4C7 0A5E 0000 00A3 0000" /* . .c.=...^...... */ - $"00A3 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"0009 4D6F 6E61 636F 0049 6E63 066D 6040" /* ..Monaco.Inc.m`@ */ ++ $"3837 0D09 416C 6C20 7269 6768 7473 2072" /* 87..All rights r */ ++ $"6573 0006 0004 002A 0007 0156 01DD 002A" /* es.....*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"0050 0020 0363 043D 0050 0020 0363 043D" /* .P. .c.=.P. .c.= */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"C849 C28A 3FE5 3230 0004 0000 0000 0000" /* .I..?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -181392,8 +181820,18 @@ deleted file mode 100644 - $"6972 7374 2043 6865 636B 496E 2028 5265" /* irst CheckIn (Re */ - $"7669 7369 6F6E 2032 2066 726F 6D20 5265" /* vision 2 from Re */ - $"616C 6974 7929 2E00" /* ality).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/Lists.h b/Interfaces/CIncludes/Lists.h --- a/Interfaces/CIncludes/Lists.h +++ b/Interfaces/CIncludes/Lists.h @@ -183131,15 +183569,16 @@ diff --git a/Interfaces/CIncludes/Lists.h.rdump b/Interfaces/CIncludes/Lists.h.r }; diff --git a/Interfaces/CIncludes/Locale.h b/Interfaces/CIncludes/Locale.h -deleted file mode 100644 --- a/Interfaces/CIncludes/Locale.h -+++ /dev/null -@@ -1,73 +0,0 @@ --/* ++++ b/Interfaces/CIncludes/Locale.h +@@ -1,31 +1,24 @@ + /* - Locale.h - Localization -- ++ locale.h - Localization + - Copyright Apple Computer, Inc. 1988, 1990-1991 -- All rights reserved. ++ Copyright Apple Computer, Inc. 1988, 1990, 1993-1995 + All rights reserved. - This file is used in these builds: ROM System - - @@ -183150,82 +183589,93 @@ deleted file mode 100644 - <2> 8/8/91 JL Update copyright - - To Do: --*/ -- --#ifndef __LOCALE__ --#define __LOCALE__ -- --/* -- * Declarations -- */ -- ++ + */ + + #ifndef __LOCALE__ + #define __LOCALE__ + ++/* ++ * Get common declarations ++ */ ++ ++#include ++ + /* + * Declarations + */ + -#ifndef NULL -#define NULL 0 -#endif - --#define LC_ALL 1 /* entire locale */ --#define LC_COLLATE 2 /* strcoll and strxfrm functions */ --#define LC_CTYPE 3 /* character handling and multibyte functions */ --#define LC_MONETARY 4 /* monetary formatting information returned by localeconv */ --#define LC_NUMERIC 5 /* decimal point formatting input/output and string conversions */ --#define LC_TIME 6 /* strftime function */ -- --struct lconv { -- char *decimal_point; /* "." */ -- char *thousands_sep; /* "" */ -- char *grouping; /* "" */ -- char *int_curr_symbol; /* "" */ -- char *currency_symbol; /* "" */ -- char *mon_decimal_point; /* "" */ -- char *mon_thousands_sep; /* "" */ -- char *mon_grouping; /* "" */ -- char *positive_sign; /* "" */ -- char *negative_sign; /* "" */ -- char frac_digits; /* CHAR_MAX */ -- char int_frac_digits; /* CHAR_MAX */ -- char p_cs_precedes; /* CHAR_MAX */ -- char p_sep_by_space; /* CHAR_MAX */ -- char n_cs_precedes; /* CHAR_MAX */ -- char n_sep_by_space; /* CHAR_MAX */ -- char p_sign_posn; /* CHAR_MAX */ -- char n_sign_posn; /* CHAR_MAX */ --}; -- -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* -- * functions -- */ -- --char *setlocale (int category, const char *locale); --struct lconv *localeconv (void); -- --#ifdef __cplusplus --} --#endif -- + #define LC_ALL 1 /* entire locale */ + #define LC_COLLATE 2 /* strcoll and strxfrm functions */ + #define LC_CTYPE 3 /* character handling and multibyte functions */ +@@ -33,6 +26,9 @@ + #define LC_NUMERIC 5 /* decimal point formatting input/output and string conversions */ + #define LC_TIME 6 /* strftime function */ + ++#ifdef powerc ++#pragma options align=power ++#endif + struct lconv { + char *decimal_point; /* "." */ + char *thousands_sep; /* "" */ +@@ -53,6 +49,9 @@ struct lconv { + char p_sign_posn; /* CHAR_MAX */ + char n_sign_posn; /* CHAR_MAX */ + }; ++#ifdef powerc ++#pragma options align=reset ++#endif + + + #ifdef __cplusplus +@@ -63,11 +62,19 @@ extern "C" { + * functions + */ + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif ++ + char *setlocale (int category, const char *locale); + struct lconv *localeconv (void); + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off ++#endif ++ + #ifdef __cplusplus + } + #endif + -#endif __LOCALE__ ++#endif /*__LOCALE__*/ diff --git a/Interfaces/CIncludes/Locale.h.rdump b/Interfaces/CIncludes/Locale.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/Locale.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/Locale.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0072 7320 0000 0694" /* ..Monaco.rs .... */ - $"2078 7878 0D0D 0943 6F70 7972 6967 6874" /* xxx...Copyright */ - $"0000 0006 0004 0050 0020 0363 043D 0050" /* .......P. .c.=.P */ - $"0020 0363 043D A4FE 7988 0000 00BF 0000" /* . .c.=..y....... */ - $"0121 0000 0000 0100" /* .!...... */ --}; -- --data 'MPSR' (1008) { ++ $"0009 4D6F 6E61 636F 00FF 0159 066D 2460" /* ..Monaco...Y.m$` */ ++ $"0000 0040 000A 0000 0000 0000 0000 0160" /* ...@...........` */ ++ $"0000 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"0050 0020 0363 043D 0050 0020 0363 043D" /* .P. .c.=.P. .c.= */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"BE43 BA83 3FE5 3230 0004 0000 0000 0000" /* .C..?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -183237,8 +183687,18 @@ deleted file mode 100644 - $"6972 7374 2043 6865 636B 496E 2028 5265" /* irst CheckIn (Re */ - $"7669 7369 6F6E 2033 2066 726F 6D20 5265" /* vision 3 from Re */ - $"616C 6974 7929 2E00" /* ality).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/LocationManager.h b/Interfaces/CIncludes/LocationManager.h new file mode 100644 --- /dev/null @@ -210124,19 +210584,19 @@ new file mode 100644 +}; + diff --git a/Interfaces/CIncludes/Math.h b/Interfaces/CIncludes/Math.h -deleted file mode 100644 --- a/Interfaces/CIncludes/Math.h -+++ /dev/null -@@ -1,69 +0,0 @@ --/************************************************************ -- ++++ b/Interfaces/CIncludes/Math.h +@@ -1,69 +1,132 @@ + /************************************************************ + -Created: Friday, September 15, 1989 at 6:14 PM -- Math.h -- C Interface to the Macintosh Libraries -- -- + Math.h + C Interface to the Macintosh Libraries + + - Copyright Apple Computer, Inc. 1985-1991 -- All rights reserved ++ Copyright Apple Computer, Inc. 1985-1995 + All rights reserved - This file is used in these builds: ROM System - - @@ -210153,17 +210613,33 @@ deleted file mode 100644 - Added declarations of sqrt, log, exp, tan, cos, sin, - and atan (formerly in SANE.h). - --************************************************************/ -- -- ++ + ************************************************************/ + + -#ifndef __MATH__ -#define __MATH__ -- --#define HUGE_VAL __inf() -- --#ifdef __cplusplus --extern "C" { --#endif ++#ifndef __MATH_H__ ++#define __MATH_H__ ++ ++/* ++ Strictly conforming implementations must have the parameters to these routines ++ be double, not long double. They still get evaluated to long double precision ++ on the 68K. We expect that a lot of this confusion will eventually get settled ++ by NCEG and then we will do it the NCEG way. ++*/ ++ ++#if (__STDC__ == 1) || defined(powerc) ++#define _float_eval double ++#else /*__STDC__*/ ++#define _float_eval long double ++#endif /*__STDC__*/ + + #define HUGE_VAL __inf() + + #ifdef __cplusplus + extern "C" { + #endif -extended sin(extended x); -extended cos(extended x); -extended tan(extended x); @@ -210191,30 +210667,135 @@ deleted file mode 100644 - -extended __inf(void); -extended hypot(extended x,extended y); -- --#ifdef __cplusplus --} --#endif -- ++ ++/* ++ * We put underscores on the formal parameter names to reduce name space pollution. ++ * Plum-Hall tests require that we do this: they have macros called exp, size etc. ++ */ ++ ++/* ++ * ANSI routines ++ */ ++ ++_float_eval sin(_float_eval _x); ++_float_eval cos(_float_eval _x); ++_float_eval tan(_float_eval _x); ++_float_eval asin(_float_eval _x); ++_float_eval acos(_float_eval _x); ++_float_eval atan(_float_eval _x); ++_float_eval atan2(_float_eval _y,_float_eval _x); ++_float_eval sinh(_float_eval _x); ++_float_eval cosh(_float_eval _x); ++_float_eval tanh(_float_eval _x); ++_float_eval exp(_float_eval _x); ++_float_eval log(_float_eval _x); ++_float_eval log10(_float_eval _x); ++_float_eval frexp(_float_eval _x,int *_exp); ++_float_eval ldexp(_float_eval _x,int _n); ++ ++_float_eval modf(_float_eval _x, _float_eval *_ip); ++ ++_float_eval pow(_float_eval _x,_float_eval _y); ++_float_eval sqrt(_float_eval _x); ++_float_eval floor(_float_eval _x); ++_float_eval ceil(_float_eval _x); ++_float_eval fmod(_float_eval _x,_float_eval _y); ++_float_eval fabs(_float_eval _x); ++ ++_float_eval __inf(void); ++ ++/* ++ * Apple extentions ++ */ ++ ++/* CFront can't handle the pretty version of this conditional ++#if defined (__useAppleExts__) || \ ++ ((defined (applec) && ! defined (__STDC__)) || \ ++ (defined (__PPCC__) && __STDC__ == 0)) ++*/ ++#if defined (__useAppleExts__) || ((defined (applec) && ! defined (__STDC__)) || (defined (__PPCC__) && __STDC__ == 0)) ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif ++ ++char *ecvt(extended value,int ndigit,int *decpt,int *sign); /* Imported from StdCLib. */ ++char *fcvt(extended value,int ndigit,int *decpt,int *sign); /* Imported from StdCLib. */ ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off ++#endif ++ ++_float_eval hypot(_float_eval _x,_float_eval _y); ++ ++ ++#ifdef powerc ++/* ++ * If you use modf() you must decide which version you mean: modf(), ++ * modff() or modfl(). The usual promotions to long double don't ++ * help here because we're using a pointer. ++ * ++ * NOTE: both modff() and modfl() are not ANSI defined functions; ++ * if you use it, your code may not be portable. ++ */ ++ ++float modff(float _x,float *_ip); ++long double modfl(long double _x, long double *_ip); ++ ++#else ++/* ++ * For the 68K, these are defined as macros which evaluate to modf(), ++ * since for the 68K world there is no difference between modf(), modff(), ++ * and modfl(). (Functional implementations are also provided if you are ++ * linking with MathLib.o. If you link with CSANELib.o and Math.o, ++ * attempting to use the function instead of the macro will cause link ++ * errors as these are not available as functions in the older SANE engine.) ++ */ ++ ++float modff(float _x,float *_ip); ++#define modff(_x,_ip) modf(_x,_ip) ++long double modfl(long double _x, long double *_ip); ++#define modfl(_x,_ip) modf(_x,_ip) ++ ++#endif /* powerc */ ++ ++#endif /* __useAppleExts__ */ + + #ifdef __cplusplus + } + #endif + -#endif ++#endif /* __MATH_H__ */ diff --git a/Interfaces/CIncludes/Math.h.rdump b/Interfaces/CIncludes/Math.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/Math.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/Math.h.rdump +@@ -1,26 +1,31 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0000 0000 0000 0000" /* ..Monaco........ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0006 0004 0050 0020 0363 043D 0050" /* .......P. .c.=.P */ - $"0020 0363 043D A4C7 0949 0000 0112 0000" /* . .c.=...I...... */ - $"0112 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"0009 4D6F 6E61 636F 002A 2A2A 066D 3450" /* ..Monaco.***.m4P */ ++ $"7265 6174 6564 3A20 4672 6964 6179 2C20" /* reated: Friday, */ ++ $"5365 0006 0004 002A 0007 0156 01DD 002A" /* Se.....*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ ++}; ++ ++data 'MPSR' (1007) { ++ $"0001 0000 0000 0000 0000 175F 5F63 6653" /* ...........__cfS */ ++ $"656C 6563 7469 6F6E 4F6E 456E 7472 795F" /* electionOnEntry_ */ ++ $"5F00" /* _. */ + }; + + data 'MPSR' (1008) { - $"0050 0020 0363 043D 0050 0020 0363 043D" /* .P. .c.=.P. .c.= */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"A77D 48DC 3FE5 3230 0004 0000 0000 0000" /* .}H.?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -210226,8 +210807,18 @@ deleted file mode 100644 - $"7374 2043 6865 636B 496E 2028 5265 7669" /* st CheckIn (Revi */ - $"7369 6F6E 2033 2066 726F 6D20 5265 616C" /* sion 3 from Real */ - $"6974 7929 2E00" /* ity).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/Math64.h b/Interfaces/CIncludes/Math64.h new file mode 100644 --- /dev/null @@ -278586,19 +279177,23 @@ new file mode 100644 +}; + diff --git a/Interfaces/CIncludes/Perf.h b/Interfaces/CIncludes/Perf.h -deleted file mode 100644 --- a/Interfaces/CIncludes/Perf.h -+++ /dev/null -@@ -1,103 +0,0 @@ --/************************************************************ -- ++++ b/Interfaces/CIncludes/Perf.h +@@ -1,31 +1,12 @@ + /************************************************************ + -Created: Thursday, September 7, 1989 at 9:15 PM - Perf.h - C Interface to the Macintosh Libraries -- ++ Perf.h ++ ++ version 2.0 ++ C Interface to PerformLib.o + - - Copyright Apple Computer, Inc. 1986-1991 -- All rights reserved ++ Copyright Apple Computer, Inc. 1986-1996 + All rights reserved - This file is used in these builds: ROM System - - @@ -278618,99 +279213,91 @@ deleted file mode 100644 - Memory model independent, i.e. works for Desk Accessories and drivers. - Uses TimeManager on new ROMs, Vertical Blanking interrupt on 64 K ROMs. - -- --************************************************************/ -- -- --#ifndef __PERF__ --#define __PERF__ -- --#ifndef __TYPES__ --#include --#endif -- --struct TPerfGlobals { -- long startROM; /*ROM Base*/ -- long romHits; /*used if MeasureROM is false*/ -- long misses; /*count of PC values outside measured memory*/ -- long (*segArray)[1]; /*array of segment handles*/ -- long (*sizeArray)[1]; /*array of segment sizes*/ -- short (**idArray)[1]; /*array of segment rsrc IDs*/ -- long (*baseArray)[1]; /*array of offsets to counters for each segment*/ -- long (*samples)[1]; /*samples buffer*/ -- long buffSize; /*size of samples buffer in bytes*/ -- short timeInterval; /*number of clock intervals between interrupts*/ -- short bucketSize; /*size of buckets power of 2*/ -- short log2buckSize; /*used in CvtPC*/ -- short pcOffset; /*offset to the user PC at interrupt time.*/ -- short numMeasure; /*# Code segments (w/o jump table)- ROM etc.*/ -- short firstCode; /*index of first Code segment*/ -- Boolean takingSamples; /*true if sampling is enabled.*/ -- Boolean measureROM; -- Boolean measureCode; -- short ramSeg; /*index of "segment" record to cover RAM > 0 if RAM (misses) are to be bucketed.*/ -- long ramBase; /*beginning of RAM being measured.*/ -- short measureRAMbucketSize; -- short measureRAMlog2buckSize; -- short romVersion; -- short vRefNum; /*Volume where the report file is to be created*/ -- Boolean volumeSelected; /*True if user selects the report file name*/ -- Str255 rptFileName; /*Report file name*/ -- Str255 rptFileCreator; /*Report File Creator*/ -- Str255 rptFileType; /*Report File type*/ -- ResType getResType; /*Resource type*/ --}; -- --typedef struct TPerfGlobals TPerfGlobals; --typedef TPerfGlobals *TP2PerfGlobals; -- --/* PerfGlobals are declared as a record, so main program can allocate --as globals, desk accessory can add to globals allocated via pointer, --print driver can allocate via low memory, etc. */ -- + + ************************************************************/ + +@@ -37,6 +18,18 @@ Created: Thursday, September 7, 1989 at 9:15 PM + #include + #endif + ++#ifndef __CONDITIONALMACROS__ ++#include ++#endif ++ ++#if GENERATINGPOWERPC ++#error "Perf.h is only valid for 680x0 code." ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + struct TPerfGlobals { + long startROM; /*ROM Base*/ + long romHits; /*used if MeasureROM is false*/ +@@ -76,19 +69,19 @@ typedef TPerfGlobals *TP2PerfGlobals; + as globals, desk accessory can add to globals allocated via pointer, + print driver can allocate via low memory, etc. */ + - - -#ifdef __cplusplus -extern "C" { -#endif --pascal Boolean InitPerf(TP2PerfGlobals *thePerfGlobals,short timerCount, -- short codeAndROMBucketSize,Boolean doROM,Boolean doAppCode,const Str255 appCodeType, -- short romID,const Str255 romName,Boolean doRAM,long ramLow,long ramHigh, + pascal Boolean InitPerf(TP2PerfGlobals *thePerfGlobals,short timerCount, + short codeAndROMBucketSize,Boolean doROM,Boolean doAppCode,const Str255 appCodeType, + short romID,const Str255 romName,Boolean doRAM,long ramLow,long ramHigh, - short ramBucketSize); /* called once to setup Performance monitoring - */ -pascal void TermPerf(TP2PerfGlobals thePerfGlobals); /* if InitPerf succeeds then TermPerf must be called before terminating program. - */ --pascal Boolean PerfControl(TP2PerfGlobals thePerfGlobals,Boolean turnOn); --/* -- Call this to turn off/on measuring. -- Returns previous state. --*/ -- --pascal short PerfDump(TP2PerfGlobals thePerfGlobals,const Str255 reportFile, -- Boolean doHistogram,short rptFileColumns); /* Call this to dump the statistics into a file. */ --#ifdef __cplusplus ++ short ramBucketSize); ++ ++/* called once to setup Performance monitoring */ ++ ++pascal void TermPerf(TP2PerfGlobals thePerfGlobals); ++ ++/* if InitPerf succeeds then TermPerf must be called before terminating program. */ ++ + pascal Boolean PerfControl(TP2PerfGlobals thePerfGlobals,Boolean turnOn); ++ + /* + Call this to turn off/on measuring. + Returns previous state. +@@ -96,8 +89,9 @@ pascal Boolean PerfControl(TP2PerfGlobals thePerfGlobals,Boolean turnOn); + + pascal short PerfDump(TP2PerfGlobals thePerfGlobals,const Str255 reportFile, + Boolean doHistogram,short rptFileColumns); /* Call this to dump the statistics into a file. */ ++ + #ifdef __cplusplus -} --#endif -- --#endif ++} /* extern c */ + #endif + + #endif diff --git a/Interfaces/CIncludes/Perf.h.rdump b/Interfaces/CIncludes/Perf.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/Perf.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/Perf.h.rdump +@@ -1,26 +1,24 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0000 0000 0000 0000" /* ..Monaco........ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0006 0004 0050 0020 0363 043D 0050" /* .......P. .c.=.P */ - $"0020 0363 043D A4C7 07ED 0000 0113 0000" /* . .c.=.......... */ - $"0113 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"0009 4D6F 6E61 636F 0068 7572 0125 7FD0" /* ..Monaco.hur.%.. */ ++ $"2C20 5365 7074 656D 6265 7220 372C 2031" /* , September 7, 1 */ ++ $"3938 0006 0004 002A 0003 01CA 023C 002A" /* 98.....*.....<.* */ ++ $"0003 01CA 023C ADB8 D729 0000 004A 0000" /* .....<...)...J.. */ ++ $"004A 0000 0000 0100" /* .J...... */ + }; + + data 'MPSR' (1008) { - $"0050 0020 0363 043D 0050 0020 0363 043D" /* .P. .c.=.P. .c.= */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0003 01CA 023C 002A 0003 01CA 023C" /* .*.....<.*.....< */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"A585 4BE0 3FE5 3230 0004 0000 0000 0000" /* ..K.?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -278722,8 +279309,17 @@ deleted file mode 100644 - $"7374 2043 6865 636B 496E 2028 5265 7669" /* st CheckIn (Revi */ - $"7369 6F6E 2033 2066 726F 6D20 5265 616C" /* sion 3 from Real */ - $"6974 7929 2E00" /* ity).. */ --}; -- ++data 'vers' (1) { ++ $"0200 8000 0000 0332 2E30 2332 2E30 2C20" /* .......2.0#2.0, */ ++ $"A920 4170 706C 6520 436F 6D70 7574 6572" /* . Apple Computer */ ++ $"2C20 496E 632E 2031 3938 362D 3936" /* , Inc. 1986-96 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/Picker.h b/Interfaces/CIncludes/Picker.h --- a/Interfaces/CIncludes/Picker.h +++ b/Interfaces/CIncludes/Picker.h @@ -361318,15 +361914,15 @@ diff --git a/Interfaces/CIncludes/Serial.h.rdump b/Interfaces/CIncludes/Serial.h }; diff --git a/Interfaces/CIncludes/SetJmp.h b/Interfaces/CIncludes/SetJmp.h -deleted file mode 100644 --- a/Interfaces/CIncludes/SetJmp.h -+++ /dev/null -@@ -1,36 +0,0 @@ --/* -- SetJmp.h -- ++++ b/Interfaces/CIncludes/SetJmp.h +@@ -1,33 +1,42 @@ + /* + SetJmp.h + - Copyright Apple Computer, Inc. 1986-1991 -- All rights reserved. ++ Copyright Apple Computer, Inc. 1986-1990, 1993-1995 + All rights reserved. - - This file is used in these builds: ROM System - @@ -361337,45 +361933,73 @@ deleted file mode 100644 - __cplusplus. Changed jmp_buf type from int to long. - - To Do: -- */ -- --#ifndef __SETJMP__ --#define __SETJMP__ -- -- + */ + ++ + #ifndef __SETJMP__ + #define __SETJMP__ + ++#ifdef __CFM68K__ ++ /* We MUST use the new, larger jmp_buf for CFM-68K */ ++ #undef OLD_JMPBUF ++#endif + -typedef long *jmp_buf[12]; /* D2-D7,PC,A2-A4,A6,SP */ -- --#ifdef __cplusplus --extern "C" { --#endif -- --int __setjmp(jmp_buf env); --#define setjmp(env) __setjmp(env) ++#if defined (powerc) ++ typedef long *jmp_buf[64]; /* PowerPC: LR,CR,SP,TOC,RESVD,R13-R31,FP14-FP31,FPSCR,RESVD,RESVD */ ++#elif defined (OLD_JMPBUF) ++ typedef long *jmp_buf[12]; /* old 68K: D2-D7,PC,A2-A4,A6,SP */ ++#else ++ typedef long *jmp_buf[16]; /* new 68K: D2-D7,PC,A2-A4,A6,SP,FLAGS,A5,RESVD,RESVD */ ++#endif + + #ifdef __cplusplus + extern "C" { + #endif + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif ++ + int __setjmp(jmp_buf env); + #define setjmp(env) __setjmp(env) -void longjmp(jmp_buf, int); -- --#ifdef __cplusplus --} --#endif -- --#endif ++void longjmp(jmp_buf env, int val); ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off ++#endif + + #ifdef __cplusplus + } diff --git a/Interfaces/CIncludes/SetJmp.h.rdump b/Interfaces/CIncludes/SetJmp.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/SetJmp.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/SetJmp.h.rdump +@@ -1,26 +1,31 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0000 0000 0000 0000" /* ..Monaco........ */ -- $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ ++ $"0009 4D6F 6E61 636F 0000 0000 066D 33A0" /* ..Monaco.....m3. */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0006 0004 00F2 00F7 0276 0367 00F2" /* ...........v.g.. */ - $"00F7 0276 0367 A4C7 01B0 0000 0059 0000" /* ...v.g.......Y.. */ - $"0087 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"0000 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ ++}; ++ ++data 'MPSR' (1007) { ++ $"0001 0000 0317 0000 0317 175F 5F63 6653" /* ...........__cfS */ ++ $"656C 6563 7469 6F6E 4F6E 456E 7472 795F" /* electionOnEntry_ */ ++ $"5F00" /* _. */ + }; + + data 'MPSR' (1008) { - $"00F2 00F7 0276 0367 00F2 00F7 0276 0367" /* .....v.g.....v.g */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"CF4C C286 3FE5 3230 0004 0000 0000 0000" /* .L..?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -361387,8 +362011,18 @@ deleted file mode 100644 - $"6972 7374 2043 6865 636B 496E 2028 5265" /* irst CheckIn (Re */ - $"7669 7369 6F6E 2035 2066 726F 6D20 5265" /* vision 5 from Re */ - $"616C 6974 7929 2E00" /* ality).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/ShutDown.h b/Interfaces/CIncludes/ShutDown.h --- a/Interfaces/CIncludes/ShutDown.h +++ b/Interfaces/CIncludes/ShutDown.h @@ -361700,96 +362334,107 @@ diff --git a/Interfaces/CIncludes/ShutDown.h.rdump b/Interfaces/CIncludes/ShutDo }; diff --git a/Interfaces/CIncludes/Signal.h b/Interfaces/CIncludes/Signal.h -deleted file mode 100644 --- a/Interfaces/CIncludes/Signal.h -+++ /dev/null -@@ -1,68 +0,0 @@ --/* -- Signal.h -- Signal handling -- ++++ b/Interfaces/CIncludes/Signal.h +@@ -1,35 +1,32 @@ + /* + Signal.h -- Signal handling + - Copyright Apple Computer,Inc. 1988, 1990-1991 -- All rights reserved. ++ Copyright Apple Computer,Inc. 1988, 1990, 1995 + All rights reserved. - This file is used in these builds: ROM System -- + - - Change History (most recent first): - - <4> 8/8/91 JL Updated copyright - - To Do: --*/ -- --#ifndef __SIGNAL__ --#define __SIGNAL__ -- -- --typedef int sig_atomic_t; -- -- --/* -- * Special signal handlers, compatible with the second argument to signal() -- * or, in the case of SIG_ERR, the return value from signal(). -- */ -- + */ + + #ifndef __SIGNAL__ + #define __SIGNAL__ + ++#ifdef __cplusplus ++extern "C" { ++#endif + + typedef int sig_atomic_t; + ++typedef void ( *__sigfun )( int __sig ); + + /* + * Special signal handlers, compatible with the second argument to signal() + * or, in the case of SIG_ERR, the return value from signal(). + */ + -#define SIG_DFL ((void (*)(int)) 1) -#define SIG_ERR ((void (*)(int)) -1) -#define SIG_IGN ((void (*)(int)) 0) -#define SIG_HOLD ((void (*)(int)) 3) -#define SIG_RELEASE ((void (*)(int)) 5) -- -- --/* -- * Signal numbers for specific conditions. -- */ -- --#define SIGABRT (1<<0) /* Abnormal termination e.g. by the abort() function */ --#define SIGFPE (1<<2) /* Arithmetic exception -- not currently implemented */ --#define SIGILL (1<<3) /* Illegal instruction -- not currently implemented */ --#define SIGINT (1<<1) /* Interactive attention signal -- User interrupt via CMD-. */ --#define SIGSEGV (1<<4) /* Segmentation violation -- not currently implemented */ --#define SIGTERM (1<<5) /* Termination request -- not currently implemented */ -- -- ++#define SIG_DFL (( __sigfun ) 1) ++#define SIG_ERR (( __sigfun ) -1) ++#define SIG_IGN (( __sigfun ) 0) ++#define SIG_HOLD (( __sigfun ) 3) ++#define SIG_RELEASE (( __sigfun ) 5) + + + /* +@@ -44,22 +41,26 @@ typedef int sig_atomic_t; + #define SIGTERM (1<<5) /* Termination request -- not currently implemented */ + + -#ifdef __cplusplus -extern "C" { --#endif -- --/* -- * Specify a signal handling function. -- */ -- ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on + #endif + + /* + * Specify a signal handling function. + */ + -void (*signal (int sig, void (*func) (int))) (int); -- -- --/* -- * Send a signal. -- */ -- ++extern __sigfun signal(int sig, __sigfun func); + + + /* + * Send a signal. + */ + -int raise (int sig); -- --#ifdef __cplusplus --} --#endif -- --#endif ++extern int raise (int sig); ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off ++#endif + + #ifdef __cplusplus + } diff --git a/Interfaces/CIncludes/Signal.h.rdump b/Interfaces/CIncludes/Signal.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/Signal.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/Signal.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0001 2208 0024 009E" /* ..Monaco.."..$.. */ -- $"000A 0157 0249 009E 0052 0249 7FFF 00A9" /* ...W.I...R.I.... */ ++ $"0009 4D6F 6E61 636F 0001 2208 066D 2570" /* ..Monaco.."..m%p */ + $"000A 0157 0249 009E 0052 0249 7FFF 00A9" /* ...W.I...R.I.... */ - $"000A 0006 0004 003C 0024 0363 043D 003C" /* .......<.$.c.=.< */ - $"0024 0363 043D A4C7 015E 0000 009A 0000" /* .$.c.=...^...... */ - $"009A 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"000A 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"003C 0024 0363 043D 003C 0024 0363 043D" /* .<.$.c.=.<.$.c.= */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"C272 B685 3FE5 3230 0004 0000 0000 0000" /* .r..?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -361801,8 +362446,18 @@ deleted file mode 100644 - $"6972 7374 2043 6865 636B 496E 2028 5265" /* irst CheckIn (Re */ - $"7669 7369 6F6E 2034 2066 726F 6D20 5265" /* vision 4 from Re */ - $"616C 6974 7929 2E00" /* ality).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/SizeTDef.h b/Interfaces/CIncludes/SizeTDef.h new file mode 100644 --- /dev/null @@ -373524,58 +374179,82 @@ diff --git a/Interfaces/CIncludes/Start.h.rdump b/Interfaces/CIncludes/Start.h.r }; diff --git a/Interfaces/CIncludes/StdArg.h b/Interfaces/CIncludes/StdArg.h -deleted file mode 100644 --- a/Interfaces/CIncludes/StdArg.h -+++ /dev/null -@@ -1,30 +0,0 @@ --/* -- StdArg.h -- Variable arguments -- ++++ b/Interfaces/CIncludes/StdArg.h +@@ -1,28 +1,39 @@ + /* + StdArg.h -- Variable arguments + - Copyright Apple Computer,Inc. 1987, 1990-1991 -- All rights reserved. ++ Copyright Apple Computer,Inc. 1987, 1990, 1994, 1995 + All rights reserved. - This file is used in these builds: ROM System -- + - - Change History (most recent first): - - <4> 8/8/91 JL Updated copyright - - To Do: --*/ -- -- --#ifndef __STDARG__ --#define __STDARG__ -- + */ + + + #ifndef __STDARG__ + #define __STDARG__ + -#ifndef __va_list__ -#define __va_list__ -typedef char *va_list; --#endif -- ++/* ++ * Get common declarations ++ */ ++ ++#include ++#include ++#include ++ ++#if __spillargs ++ /* "__spillargs" needed for PowerMac register-based calling conventions. */ ++ /* When using other preprocessors other than MrC, simply define "__spillargs". */ ++ #undef __spillargs ++ extern int __spillargs; ++ #define va_start(ap, parmN) ap = (__spillargs, (va_list)((unsigned int)&(parmN) + (((sizeof(parmN)+3)/4)*4))) ++ ++#elif !defined (__SC__) || defined (__CFM68K__) || defined(__MRC__) ++ /* most normal compilers are long-word aligned… */ ++ #define va_start(ap, parmN) ap = (va_list)((unsigned int)&(parmN) + (((sizeof(parmN)+3)/4)*4)) ++ ++#else ++ /* …but Symantec C is word aligned. */ ++ #define va_start(ap, parmN) ap = (va_list)((char*)&parmN + (((sizeof(parmN)+1)/2)*2)) + #endif + -#define va_start(ap, parmN) ap = (va_list) ((char *)&parmN + sizeof (parmN)) --#define va_arg(ap, type) ((type *)(ap += sizeof (type)))[-1] --#define va_end(ap) /* do nothing */ -- -- --#endif + #define va_arg(ap, type) ((type *)(ap += sizeof (type)))[-1] + #define va_end(ap) /* do nothing */ + diff --git a/Interfaces/CIncludes/StdArg.h.rdump b/Interfaces/CIncludes/StdArg.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/StdArg.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/StdArg.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 000E 0009 000E 000A" /* ..Monaco........ */ -- $"00DF 00E1 00DF 00E2 00EA 00E1 00EA 00E2" /* ................ */ ++ $"0009 4D6F 6E61 636F 000E 0009 066D 5DB0" /* ..Monaco.....m]. */ + $"00DF 00E1 00DF 00E2 00EA 00E1 00EA 00E2" /* ................ */ - $"0000 0006 0004 0092 0017 01CA 0227 0092" /* .............'.. */ - $"0017 01CA 0227 A4C7 0077 0000 009D 0000" /* .....'...w...... */ - $"009D 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"0000 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"0092 0017 01CA 0227 0092 0017 01CA 0227" /* .......'.......' */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"BF4B C78B 3FE5 3230 0004 0000 0000 0000" /* .K..?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -373587,32 +374266,63 @@ deleted file mode 100644 - $"6972 7374 2043 6865 636B 496E 2028 5265" /* irst CheckIn (Re */ - $"7669 7369 6F6E 2034 2066 726F 6D20 5265" /* vision 4 from Re */ - $"616C 6974 7929 2E00" /* ality).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/StdDef.h b/Interfaces/CIncludes/StdDef.h -deleted file mode 100644 --- a/Interfaces/CIncludes/StdDef.h -+++ /dev/null -@@ -1,35 +0,0 @@ --/* -- StdDef.h -- Common definitions -- ++++ b/Interfaces/CIncludes/StdDef.h +@@ -1,35 +1,36 @@ + /* + StdDef.h -- Common definitions + - Copyright Apple Computer,Inc. 1987-1991 -- All rights reserved. ++ Copyright Apple Computer,Inc. 1987-1990, 1994, 1995 + All rights reserved. - This file is used in these builds: ROM System -- -- + + - Change History (most recent first): - - <4> 8/8/91 JL Updated copyright - - To Do: --*/ -- + */ + -#ifndef __STDDEF__ --#define __STDDEF__ -- --typedef int ptrdiff_t; ++#if ! defined (__STDDEF__) + #define __STDDEF__ + ++/* ++ NULL - this macro is defined by several ANSI headers and Types.h ++*/ ++ ++#include ++ ++/* ++ size_t - this type is defined by several ANSI headers. ++*/ ++ ++#include ++ ++/* ++ wchar_t - this type is defined only by stddef and stdlib. ++*/ ++ ++#include ++ ++/* Definitions unique to stddef.h */ ++ + typedef int ptrdiff_t; - -#ifndef __size_t__ -#define __size_t__ @@ -373626,27 +374336,31 @@ deleted file mode 100644 - -#define NULL 0 - --#define offsetof(structure,field) ((size_t)&((structure *) 0)->field) -- --#endif + #define offsetof(structure,field) ((size_t)&((structure *) 0)->field) + + #endif diff --git a/Interfaces/CIncludes/StdDef.h.rdump b/Interfaces/CIncludes/StdDef.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/StdDef.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/StdDef.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0020 436F 6D70 7574" /* ..Monaco. Comput */ -- $"6572 2C49 6E63 2E09 3139 3837 0D09 416C" /* er,Inc..1987..Al */ ++ $"0009 4D6F 6E61 636F 0020 436F 066D 3B30" /* ..Monaco. Co.m;0 */ + $"6572 2C49 6E63 2E09 3139 3837 0D09 416C" /* er,Inc..1987..Al */ - $"6C20 0006 0004 007C 0014 021D 022D 007C" /* l .....|.....-.| */ - $"0014 021D 022D A4C6 FFA9 0000 0097 0000" /* .....-.......... */ - $"0097 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"6C20 0006 0004 002A 0007 0156 01DD 002A" /* l .....*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"007C 0014 021D 022D 007C 0014 021D 022D" /* .|.....-.|.....- */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"BF4F BA8A 3FE5 3230 0004 0000 0000 0000" /* .O..?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -373658,22 +374372,35 @@ deleted file mode 100644 - $"6972 7374 2043 6865 636B 496E 2028 5265" /* irst CheckIn (Re */ - $"7669 7369 6F6E 2034 2066 726F 6D20 5265" /* vision 4 from Re */ - $"616C 6974 7929 2E00" /* ality).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/StdIO.h b/Interfaces/CIncludes/StdIO.h -deleted file mode 100644 --- a/Interfaces/CIncludes/StdIO.h -+++ /dev/null -@@ -1,273 +0,0 @@ --/************************************************************ -- ++++ b/Interfaces/CIncludes/StdIO.h +@@ -1,273 +1,289 @@ + /************************************************************ + - StdIO.h - Input / output - - Copyright © Apple Computer,Inc. 1985-1991. -- ++ stdio.h ++ Standard input and output. + - This file is used in these builds: ROM System -- ++ Copyright Apple Computer,Inc. 1995 ++ All rights reserved + - Copyright American Telephone & Telegraph - Used with permission, Apple Computer Inc. (1985) - All Rights Reserved. @@ -373686,29 +374413,37 @@ deleted file mode 100644 - <4> 10/24/90 JL Matching MPW version - - To Do: --************************************************************/ -- -- --#ifndef __STDIO__ --#define __STDIO__ -- + ************************************************************/ + + + #ifndef __STDIO__ + #define __STDIO__ + -#define NULL 0 - -#ifndef __size_t__ -#define __size_t__ -typedef unsigned int size_t; -#endif -- ++/* ++ * Include common declarations ++ */ + -#ifndef __va_list__ -#define __va_list__ -typedef char *va_list; -#endif -- -- --/* ++#include ++#include ++#include ++#include + + + /* - * The basic data structure for a stream is the FILE. -- */ -- ++ * The basic data structure for a stream is the FILE type. + */ + -typedef struct { - int _cnt; - unsigned char *_ptr; @@ -373718,21 +374453,42 @@ deleted file mode 100644 - unsigned short _flag; - unsigned short _file; -} FILE; -- -- --/* ++#ifdef powerc ++#pragma options align=power ++#endif ++struct FILE { ++ int _cnt; ++ unsigned char *_ptr; ++ unsigned char *_base; ++ unsigned char *_end; ++ unsigned short _size; ++ unsigned short _flag; ++ unsigned short _file; ++}; ++#ifdef powerc ++#pragma options align=reset ++#endif ++ ++typedef struct FILE FILE; + + + /* - * fpos_t is a type that can express any position in a file. A file's - * end-of-file marker has type fpos_t. -- */ -- --typedef long fpos_t; -- -- --/* ++ * The type to uniquely specify the position in a file, returned by fgetpos(). + */ + + typedef long fpos_t; + + + /* - * These macros give the meanings of bits in a FILE's _flag. setvbuf() takes - * one of _IOFBF, _IOLBF, or _IONBF as its third argument. -- */ -- ++ * Values for various bits of a FILE's _flag field. ++ * The values _IOFBF, _IOLBF, and _IONBF can be used as the ++ * third argument to setvbuf(); + */ + -#define _IOFBF 0 /* Pseudo-flag, default buffering style */ -#define _IOREAD (1<<0) /* Current mode is for reading */ -#define _IOWRT (1<<1) /* Current mode is for writing */ @@ -373744,59 +374500,95 @@ deleted file mode 100644 -#define _IORW (1<<7) /* Enable read/write access */ -#define _IOSYNC (1<<8) /* Input triggers fflush() to output fp's */ -#define _IOBINARY (1<<9) /* Binary stream */ -- -- --/* ++#define _IOFBF 0x00 /* File is fully buffered */ ++#define _IOREAD 0x01 /* File is open for Reading */ ++#define _IOWRT 0x02 /* File is open for Writing */ ++#define _IONBF 0x04 /* File I/O is unbuffered */ ++#define _IOMYBUF 0x08 /* Buffer allocated by stdio */ ++#define _IOEOF 0x10 /* End of file reached */ ++#define _IOERR 0x20 /* I/O error has occurred */ ++#define _IOLBF 0x40 /* File is line buffered */ ++#define _IORW 0x80 /* File is open for Read/Write */ ++#define _IOSYNC 0x100 /* Flush output on Read */ ++#define _IOBINARY 0x200 /* For backward compatibility */ ++#define _IOBACK 0x4000 /* For backward compatibility */ + + + /* - * Default file buffer sizes used by setbuf() and setvbuf(). -- */ -- ++ * The default buffer sizes for a fully buffered or line buffered file. + */ + -#define BUFSIZ 1024 /* default file buffer size */ -#define _LBFSIZ 100 /* Line buffer size */ -- -- --/* ++#define BUFSIZ 1024 ++#define _LBFSIZ 254 + + + /* - * The standard end-of-file indicator. -- */ -- ++ * The normal end-of-file indicator. + */ + -#define EOF (-1) -- -- --/* ++#define EOF (-1) + + + /* - * L_tmpnam is the size of char array long enough to hold a temporary file name - * generated by tmpnam(), including the trailing null byte. The name is in the - * form tmp.AAAXXXXXX, where AAA is a sequence of lower case letters ("aaa", "baa", - * ... "zzz" on successive calls), and XXXXXX is a lower case letter followed by a sequence - * of digits, all determined at runtime. - * TMP_MAX is the number of distinct file names that tmpnam() can generate. -- */ -- ++ * FOPEN_MAX is the minimum number of files that a program is guaranteed to be able ++ * to have open simultaneously (including the pre-opened stdin, stdout, and stderr). ++ * The numbers are listed in Inside Macintosh, page IV-178, as: ++ * 64K ROM, 128K Macintosh 12 files ++ * 64K ROM, 512K Macintosh 40 files ++ * 128K ROM 40 files per volume ++ * ++ * FILENAME_MAX is the maximum length of a file name, including a trailing zero byte. + */ + -#define L_tmpnam 14 -#define TMP_MAX 17576 -- -- --/* ++#define FOPEN_MAX 12 ++#define FILENAME_MAX 32 + + + /* - * The minimum number of files that a program is guaranteed to be able to have - * open simultaneously (including the pre-opened stdin, stdout, and stderr). - * The numbers are listed in Inside Macintosh, page IV-178, as: - * 64K ROM, 128K Macintosh 12 files - * 64K ROM, 512K Macintosh 40 files - * 128K ROM 40 files per volume -- */ -- ++ * L_tmpnam is the size of char array long enough to hold a temporary file name ++ * generated by tmpnam(), including the trailing null byte. The name is in the ++ * form tmp.AAAXXXXXX, where AAA is a sequence of lower case letters ("aaa", "baa", ++ * ... "zzz" on successive calls), and XXXXXX is a lower case letter followed by a sequence ++ * of digits, all determined at runtime. + */ + -#define FOPEN_MAX 12 -- -- --/* ++#define L_tmpnam 14 + + + /* - * Maximum length of a file name, including a trailing zero byte. -- */ -- ++ * TMP_MAX is the number of distinct file names that tmpnam() can generate. + */ + -#define FILENAME_MAX 32 -- -- --/* ++#define TMP_MAX 17576 + + + /* - * For use by fseek(): -- */ -- ++ * The standard predefined streams: error, input, and output + */ + -#ifndef __FCNTL__ /* these defns exactly paralled in FCntl.h for lseek() */ - -#define SEEK_CUR 1 @@ -373812,38 +374604,58 @@ deleted file mode 100644 -#define stdin (&_iob[0]) -#define stdout (&_iob[1]) -#define stderr (&_iob[2]) -- -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* ++#define stdin (&_iob[0]) ++#define stdout (&_iob[1]) ++#define stderr (&_iob[2]) + + + #ifdef __cplusplus + extern "C" { + #endif + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif ++ + /* - * Operations on files -- */ -- ++ * Operations on Files + */ + -int remove(const char *filename); -int rename(const char *oldname, const char *newname); -FILE *tmpfile(void); -char *tmpnam(char *s); -- -- --/* ++extern int remove (const char *filename); ++extern int rename (const char *oldname, const char *newname); ++extern FILE *tmpfile (void); ++extern char *tmpnam (char *s); + + + /* - * File access functions -- */ -- ++ * File Access Functions + */ + -int fclose(FILE *stream); -int fflush(FILE *stream); -FILE *fopen(const char *filename, const char *mode); -FILE *freopen(const char *filename, const char *mode, FILE *stream); -void setbuf(FILE *stream, char *buf); -int setvbuf(FILE *stream, char *buf, int mode, size_t size); -- -- --/* ++extern int fclose (FILE *stream); ++extern int fflush (FILE *stream); ++extern FILE *fopen (const char *filename, const char *mode); ++extern FILE *freopen (const char *filename, const char *mode, FILE *stream); ++extern void setbuf (FILE *stream, char *buf); ++extern int setvbuf (FILE *stream, char *buf, int mode, size_t size); + + + /* - * Formatted input/output functions -- */ -- ++ * Formatted Input/Output Functions + */ + -int fprintf(FILE *stream, const char *format, ...); -int fscanf(FILE *stream, const char *format, ...); -int printf(const char *format, ...); @@ -373853,12 +374665,49 @@ deleted file mode 100644 -int vfprintf(FILE *stream, const char *format, va_list arg); -int vprintf(const char *format, va_list arg); -int vsprintf(char *s, const char *format, va_list arg); -- -- --/* ++extern int fprintf (FILE *stream, const char *format, ...); ++extern int fscanf (FILE *stream, const char *format, ...); ++extern int printf (const char *format, ...); ++extern int scanf (const char *format, ...); ++extern int sprintf (char *s, const char *format, ...); ++extern int sscanf (const char *s, const char *format, ...); ++extern int vfprintf (FILE *stream, const char *format, va_list arg); ++extern int vprintf (const char *format, va_list arg); ++extern int vsprintf (char *s, const char *format, va_list arg); ++ ++ ++/* ++ * Character Input/Output Functions ++ */ + ++extern int fgetc (FILE *stream); ++extern char *fgets (char *s, int n, FILE *stream); ++extern int fputc (int c, FILE *stream); ++extern int fputs (const char *s, FILE *stream); ++extern int getc (FILE *stream); ++extern int getchar (void); ++extern char *gets (char *s); ++extern int putc (int c, FILE *stream); ++extern int putchar (int c); ++extern int puts (const char *s); ++extern int ungetc (int c, FILE *stream); + + /* - * Character input/output functions and macros -- */ -- ++ * WARNING!! ++ * ++ * These macros evaluate their arguments more than once. ++ * Be sure that evaluation of the "s" argument has no side effects. ++ * ++ * For example, using "getc(mychar++)" would cause "mychar" to be ++ * incremented twice. ++ * ++ * To avoid this, either assign "mychar" to a temporary, or put the ++ * function name in paranthesis, so that the macro is not envoked: ++ * "(getc)(mychar++)" ++ * + */ + -int fgetc(FILE *stream); -char *fgets(char *s, int n, FILE *stream); -int fputc(int c, FILE *stream); @@ -373876,31 +374725,47 @@ deleted file mode 100644 -#define putchar(x) putc((x), stdout) -int puts(const char *s); -int ungetc(int c, FILE *stream); -- -- --/* ++#define getc(s) (--(s)->_cnt >= 0 ? (int) *(s)->_ptr++ : _filbuf(s)) ++#define getchar() (getc(stdin)) ++#define putc(c, s) (--(s)->_cnt >= 0 ? \ ++ ((int) (*(s)->_ptr++ = (unsigned char) (c))) : \ ++ _flsbuf((unsigned char) (c), (s))) ++#define putchar(c) (putc((c), stdout)) + + + /* - * Direct input/output functions -- */ -- ++ * Direct Input/Output Functions + */ + -size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream); -size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream); -- -- --/* ++extern size_t fread (void *ptr, size_t size, size_t nmemb, FILE *stream); ++extern size_t fwrite (const void *ptr, size_t size, size_t nmemb, FILE *stream); + + + /* - * File positioning functions -- */ -- ++ * File Positioning Functions + */ + -int fgetpos(FILE *stream, fpos_t *pos); -int fseek(FILE *stream, long int offset, int whence); -int fsetpos(FILE *stream, const fpos_t *pos); -long int ftell(FILE *stream); -void rewind(FILE *stream); -- -- --/* ++extern int fgetpos (FILE *stream, fpos_t *pos); ++extern int fseek (FILE *stream, long int offset, int whence); ++extern int fsetpos (FILE *stream, const fpos_t *pos); ++extern long int ftell (FILE *stream); ++extern void rewind (FILE *stream); + + + /* - * Error-handling functions and macros -- */ -- ++ * Error Handling Functions + */ + -void clearerr(FILE *stream); -#define clearerr(p) ((void)((p)->_flag &= ~(_IOERR | _IOEOF))) -int feof(FILE *stream); @@ -373908,54 +374773,105 @@ deleted file mode 100644 -int ferror(FILE *stream); -#define ferror(p) ((p)->_flag & _IOERR) -void perror(const char *s); -- --/* ++extern void clearerr (FILE *stream); ++extern int feof (FILE *stream); ++extern int ferror (FILE *stream); ++extern void perror (const char *s); ++ ++#define clearerr(s) ((void)((s)->_flag &= ~(_IOERR | _IOEOF))) ++#define feof(s) ((s)->_flag & _IOEOF) ++#define ferror(s) ((s)->_flag & _IOERR) ++ + + /* - * For macros -- */ -- ++ * Internal structures exposed by previous macro definitions. + */ + -extern FILE _iob[]; -#define _NFILE 20 -int _filbuf(FILE *); -int _flsbuf(unsigned char, FILE *); -- --/* ++extern FILE _iob[]; /* Array of FILE control blocks. */ ++#define _NFILE 40 /* Size of _iob. */ ++ ++extern int _filbuf(FILE *); ++extern int _flsbuf(unsigned char, FILE *); ++ + + /* - * Non-ANSI extensions -- */ -- ++ * Non-ANSI extensions ++ * ++ * The prefered mechanism for enabling these is by defining __useAppleExts__. ++ * In the absence of this symbol, the __STDC__ symbol is used to enable or ++ * disable these extentions. + */ + -#ifndef __STDC__ -- ++#if defined (__useAppleExts__) || \ ++ (defined (applec) && ! defined (__STDC__)) || \ ++ (defined (__PPCC__) && __STDC__ == 0) ++ ++#define fileno(p) (p)->_file ++ ++extern FILE *fdopen(int fildes, const char *mode); ++extern void fsetfileinfo (const char *filename, unsigned long newcreator, unsigned long newtype); ++extern int getw(FILE *stream); ++extern int putw(int w, FILE *stream); + -#define fileno(p) (p)->_file -FILE *fdopen(int fildes, const char *mode); -void fsetfileinfo (char *filename, unsigned long newcreator, unsigned long newtype); -int getw(FILE *stream); -int putw(int w, FILE *stream); ++#endif + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off + #endif + + #ifdef __cplusplus + } + #endif + - -#endif -- --#ifdef __cplusplus --} --#endif -- -- --#endif ++#endif /* __STDIO__ */ diff --git a/Interfaces/CIncludes/StdIO.h.rdump b/Interfaces/CIncludes/StdIO.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/StdIO.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/StdIO.h.rdump +@@ -1,26 +1,36 @@ ++data 'MPSR' (10000) { ++ $"0101 FFFF FFFF FFFF 0000 0820 0101 0000" /* ........... .... */ ++ $"0000 0000 0000 0000 0000 0000" /* ............ */ ++}; ++ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0069 6E74 2009 0909" /* ..Monaco.int ... */ - $"5F63 6E74 3B0D 0975 6E73 6967 6E65 6420" /* _cnt;..unsigned */ - $"6368 0006 0004 00FB 0236 02CB 0448 0078" /* ch.......6...H.x */ - $"0018 0248 022A A54E 8838 0000 0154 0000" /* ...H.*.N.8...T.. */ - $"01BA 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"0009 4D6F 6E61 636F 006E 632E 066D 7970" /* ..Monaco.nc..myp */ ++ $"3835 290D 0941 6C6C 2052 6967 6874 7320" /* 85)..All Rights */ ++ $"5265 0006 0004 002A 0007 0156 01DD 002A" /* Re.....*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ ++}; ++ ++data 'MPSR' (1007) { ++ $"0001 0000 1BE2 0000 1C44 175F 5F63 6653" /* .........D.__cfS */ ++ $"656C 6563 7469 6F6E 4F6E 456E 7472 795F" /* electionOnEntry_ */ ++ $"5F00" /* _. */ + }; + + data 'MPSR' (1008) { - $"00FB 0236 02CB 0448 0078 0018 0248 022A" /* ...6...H.x...H.* */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"B210 F0D3 3FE5 3230 0004 0000 0000 0000" /* ....?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -373967,161 +374883,172 @@ deleted file mode 100644 - $"7273 7420 4368 6563 6B49 6E20 2852 6576" /* rst CheckIn (Rev */ - $"6973 696F 6E20 3620 6672 6F6D 2052 6561" /* ision 6 from Rea */ - $"6C69 7479 292E 00" /* lity).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/StdLib.h b/Interfaces/CIncludes/StdLib.h -deleted file mode 100644 --- a/Interfaces/CIncludes/StdLib.h -+++ /dev/null -@@ -1,130 +0,0 @@ --/* -- StdLib.h -- General utilities -- ++++ b/Interfaces/CIncludes/StdLib.h +@@ -1,43 +1,46 @@ + /* + StdLib.h -- General utilities + - Copyright Apple Computer,Inc. 1987, 1990-1991 -- All rights reserved. ++ Copyright Apple Computer,Inc. 1987, 1990, 1993-1995 + All rights reserved. - This file is used in these builds: ROM System -- + - - Change History (most recent first): - - <4> 8/8/91 JL Updated copyright - - To Do: --*/ -- --#ifndef __STDLIB__ --#define __STDLIB__ -- + */ + ++ + #ifndef __STDLIB__ + #define __STDLIB__ + -#ifndef __size_t__ -#define __size_t__ -typedef unsigned int size_t; -#endif -- ++/* ++ * Get common declarations ++ */ + -#ifndef __wchar_t__ -#define __wchar_t__ -typedef short wchar_t; -#endif -- ++#include ++#include ++#include + -typedef struct { -- int quot; /* quotient */ -- int rem; /* remainder */ ++#ifdef powerc ++#pragma options align=power ++#endif ++struct div_t { + int quot; /* quotient */ + int rem; /* remainder */ -} div_t; -- ++} ; ++#ifdef powerc ++#pragma options align=reset ++#endif ++typedef struct div_t div_t; + -typedef struct { -- long int quot; /* quotient */ -- long int rem; /* remainder */ ++#ifdef powerc ++#pragma options align=power ++#endif ++struct ldiv_t { + long int quot; /* quotient */ + long int rem; /* remainder */ -} ldiv_t; - - -#define NULL 0 -- --#define EXIT_FAILURE 1 --#define EXIT_SUCCESS 0 -- --#define RAND_MAX 32767 -- --#define MB_CUR_MAX 1 -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* -- * String conversion functions -- */ -- --double atof (const char *nptr); --int atoi (const char *nptr); --long int atol (const char *nptr); --double strtod (const char *nptr, char **endptr); --long int strtol (const char *nptr, char **endptr, int base); --unsigned long int strtoul (const char *nptr, char **endptr, int base); -- -- --/* -- * Pseudo-random sequence generation functions -- */ -- --int rand (void); --void srand (unsigned int seed); -- -- --/* -- * Memory management functions -- */ -- --void *calloc (size_t nmemb, size_t size); --void free (void *ptr); --void *malloc (size_t size); --void *realloc (void *ptr, size_t size); -- -- --/* -- * Communication with the environment -- */ -- --void abort (void); --int atexit (void (*func)(void)); --void exit (int status); --char *getenv (const char *name); --int system (const char *string); -- -- --/* -- * Searching and sorting utilities -- */ -- --void *bsearch (const void *key, const void *base, -- size_t nmemb, size_t size, -- int (*compar)(const void *, const void *)); --void qsort (void *base, size_t nmemb, size_t size, -- int (*compar)(const void *, const void *)); -- -- --/* -- * Integer arithmetic functions -- */ -- --int abs (int j); --div_t div (int numer, int denom); --long int labs (long int j); --ldiv_t ldiv (long int numer, long int denom); -- -- --/* -- * Multibyte functions -- */ -- --int mblen (const char *s, size_t n); --int mbtowc (wchar_t *pwc, const char *s, size_t n); --int wctomb (char *s, wchar_t wchar); --size_t mbstowcs (wchar_t *pwcs, const char *s, size_t n); --size_t wcstombs (char *s, const wchar_t *pwcs, size_t n); -- -- --#ifdef __cplusplus --} --#endif -- --#endif ++}; ++#ifdef powerc ++#pragma options align=reset ++#endif ++typedef struct ldiv_t ldiv_t; + + #define EXIT_FAILURE 1 + #define EXIT_SUCCESS 0 +@@ -50,6 +53,12 @@ typedef struct { + extern "C" { + #endif + ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif ++ ++ + /* + * String conversion functions + */ +@@ -122,6 +131,45 @@ int wctomb (char *s, wchar_t wchar); + size_t mbstowcs (wchar_t *pwcs, const char *s, size_t n); + size_t wcstombs (char *s, const wchar_t *pwcs, size_t n); + ++/* ++ * Apple extentions ++ */ ++ ++/* CFront can't handle the pretty version of this conditional ++#if defined (__useAppleExts__) || \ ++ ((defined (applec) && ! defined (__STDC__)) || \ ++ (defined (__PPCC__) && __STDC__ == 0)) ++*/ ++#if defined (__useAppleExts__) || ((defined (applec) && ! defined (__STDC__)) || (defined (__PPCC__) && __STDC__ == 0)) ++ ++void _exit (int status); ++int setenv(const char *varName, const char *value); ++#define putenv(x, y) setenv((x), (y)) ++ ++#endif ++ ++#if _LONG_LONG /* Is long long supported? */ ++ ++struct lldiv_t { ++ long long int quot; /* quotient */ ++ long long int rem; /* remainder */ ++}; ++ ++typedef struct lldiv_t lldiv_t; ++ ++long long int llabs (long long int j); ++lldiv_t lldiv (long long int numer, long long int denom); ++long long int strtoll (const char *nptr, char **endptr, int base); ++unsigned long long int strtoull (const char *nptr, char **endptr, int base); ++long long int atoll (const char *nptr); ++ ++#endif /* If _LONG_LONG is supported */ ++ ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off ++#endif ++ + + #ifdef __cplusplus + } diff --git a/Interfaces/CIncludes/StdLib.h.rdump b/Interfaces/CIncludes/StdLib.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/StdLib.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/StdLib.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 004E 000C 01F8 7FFF" /* ..Monaco.N...... */ -- $"7FFF 0000 002C 0001 027E 0024 0000 0000" /* .....,...~.$.... */ ++ $"0009 4D6F 6E61 636F 004E 000C 066D 73C0" /* ..Monaco.N...ms. */ + $"7FFF 0000 002C 0001 027E 0024 0000 0000" /* .....,...~.$.... */ - $"010E 0006 0004 0064 001C 035A 0232 0064" /* .......d...Z.2.d */ - $"001C 035A 0232 A4C6 FE61 0000 009B 0000" /* ...Z.2...a...... */ - $"009B 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"010E 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ ++ $"0007 0156 01DD AF17 E24F 0000 0000 0000" /* ...V.....O...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"0064 001C 035A 0232 0064 001C 035A 0232" /* .d...Z.2.d...Z.2 */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"BF59 BE86 3FE5 3230 0004 0000 0000 0000" /* .Y..?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -374133,34 +375060,42 @@ deleted file mode 100644 - $"6972 7374 2043 6865 636B 496E 2028 5265" /* irst CheckIn (Re */ - $"7669 7369 6F6E 2034 2066 726F 6D20 5265" /* vision 4 from Re */ - $"616C 6974 7929 2E00" /* ality).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/String.h b/Interfaces/CIncludes/String.h -deleted file mode 100644 --- a/Interfaces/CIncludes/String.h -+++ /dev/null -@@ -1,90 +0,0 @@ --/************************************************************ -- -- String.h -- String handling -- ++++ b/Interfaces/CIncludes/String.h +@@ -3,44 +3,53 @@ + String.h + String handling + - Copyright Apple Computer,Inc. 1987-1991 -- All rights reserved ++ Copyright Apple Computer,Inc. 1987-1990, 1993-1996 + All rights reserved - This file is used in these builds: ROM System -- + - - Change History (most recent first): - - <4> 8/8/91 JL Updated copyright - - To Do: --************************************************************/ -- -- --#ifndef __STRING__ --#define __STRING__ -- + ************************************************************/ + + + #ifndef __STRING__ + #define __STRING__ + -#ifndef __size_t__ -#define __size_t__ -typedef unsigned int size_t; @@ -374168,86 +375103,90 @@ deleted file mode 100644 - -#define NULL 0 - --/* + /* - * Copying functions -- */ -- --#ifdef __cplusplus --extern "C" { --#endif -- --void *memcpy (void *s1, const void *s2, size_t n); --void *memmove (void *s1, const void *s2, size_t n); --char *strcpy (char *s1, const char *s2); --char *strncpy (char *s1, const char *s2, size_t n); -- ++ * Get common declarations + */ + ++#include ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif + ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif ++ ++/* ++ * Copying functions ++ */ ++ + void *memcpy (void *s1, const void *s2, size_t n); + void *memmove (void *s1, const void *s2, size_t n); + char *strcpy (char *s1, const char *s2); + char *strncpy (char *s1, const char *s2, size_t n); + -#ifndef __STDC__ --void *memccpy(void *s1, const void *s2, int c, size_t n); --#endif -- --/* -- * Concatenation functions -- */ -- --char *strcat (char *s1, const char *s2); --char *strncat (char *s1, const char *s2, size_t n); -- --/* -- * Comparison functions -- */ -- --int memcmp (const void *s1, const void *s2, size_t n); --int strcmp (const char *s1, const char *s2); --int strcoll (const char *s1, const char *s2); --int strncmp (const char *s1, const char *s2, size_t n); --size_t strxfrm (char *s1, const char *s2, size_t n); -- -- --/* -- * Search functions -- */ -- --void *memchr (const void *s, int c, size_t n); --char *strchr (const char *s, int c); --size_t strcspn (const char *s1, const char *s2); --char * strpbrk (const char *s1, const char *s2); --char *strrchr (const char *s, int c); --size_t strspn (const char *s1, const char *s2); --char *strstr (const char *s1, const char *s2); --char *strtok (char *s1, const char *s2); -- -- --/* -- * Miscellaneous functions -- */ -- --void *memset (void *s, int c, size_t n); --char *strerror (int errnum); --size_t strlen (const char *s); -- --#ifdef __cplusplus --} --#endif -- --#endif ++/* Apple library extentions. The prefered mechanism for enabling these is by defining ++ * __useAppleExts__. In the absence of this symbol, the __STDC__ symbol is used to ++ * enable or disable these extentions. */ ++ ++/* CFront can't handle the pretty version of this conditional ++#if defined (__useAppleExts__) || \ ++ ((defined (applec) && ! defined (__STDC__)) || \ ++ (defined (__PPCC__) && __STDC__ == 0)) ++*/ ++#if defined (__useAppleExts__) || ((defined (applec) && ! defined (__STDC__)) || (defined (__PPCC__) && __STDC__ == 0)) ++ + void *memccpy(void *s1, const void *s2, int c, size_t n); ++ + #endif + + /* +@@ -83,6 +92,12 @@ void *memset (void *s, int c, size_t n); + char *strerror (int errnum); + size_t strlen (const char *s); + ++ ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off ++#endif ++ ++ + #ifdef __cplusplus + } + #endif diff --git a/Interfaces/CIncludes/String.h.rdump b/Interfaces/CIncludes/String.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/String.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/String.h.rdump +@@ -1,26 +1,31 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0001 01F8 8001 7FFF" /* ..Monaco........ */ -- $"0040 000C 0040 01E9 013F 000C 013F 01E9" /* .@...@...?...?.. */ ++ $"0009 4D6F 6E61 636F 0001 01F8 066D 1F00" /* ..Monaco.....m.. */ + $"0040 000C 0040 01E9 013F 000C 013F 01E9" /* .@...@...?...?.. */ - $"01D2 0006 0004 0078 0018 0342 0230 0078" /* .......x...B.0.x */ - $"0018 0342 0230 A4C6 FDF7 0000 00CE 0000" /* ...B.0.......... */ - $"00CE 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"01D2 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ ++}; ++ ++data 'MPSR' (1007) { ++ $"0001 0000 0000 0000 0000 175F 5F63 6653" /* ...........__cfS */ ++ $"656C 6563 7469 6F6E 4F6E 456E 7472 795F" /* electionOnEntry_ */ ++ $"5F00" /* _. */ + }; + + data 'MPSR' (1008) { - $"0078 0018 0342 0230 0078 0018 0342 0230" /* .x...B.0.x...B.0 */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"CD77 C38B 3FE5 3230 0004 0000 0000 0000" /* .w..?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -374259,8 +375198,18 @@ deleted file mode 100644 - $"6972 7374 2043 6865 636B 496E 2028 5265" /* irst CheckIn (Re */ - $"7669 7369 6F6E 2034 2066 726F 6D20 5265" /* vision 4 from Re */ - $"616C 6974 7929 2E00" /* ality).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/StringCompare.h b/Interfaces/CIncludes/StringCompare.h new file mode 100644 --- /dev/null @@ -389037,19 +389986,17 @@ new file mode 100644 +}; + diff --git a/Interfaces/CIncludes/Time.h b/Interfaces/CIncludes/Time.h -deleted file mode 100644 --- a/Interfaces/CIncludes/Time.h -+++ /dev/null -@@ -1,93 +0,0 @@ --/************************************************************ -- -- Time.h -- Date and time -- ++++ b/Interfaces/CIncludes/Time.h +@@ -3,38 +3,22 @@ + Time.h + Date and time + - Copyright © Apple Computer,Inc. 1987-1991. -- All Rights Reserved. ++ Copyright © Apple Computer,Inc. 1987-1991, 1993, 1994. + All Rights Reserved. - This file is used in these builds: ROM System -- + - - Change History (most recent first): - @@ -389066,92 +390013,102 @@ deleted file mode 100644 - 8 Aug 88 SDL merged JMR's changes into this file. - 7 Oct 88 JMR Added #include for 'clock' macro - 10 Oct 88 JMR changed range of tm_secs from [0,59] to [0,60] --************************************************************/ -- -- --#ifndef __TIME_H__ /* __TIME__ is a reserved preprocessor symbol */ --#define __TIME_H__ -- + ************************************************************/ + + + #ifndef __TIME_H__ /* __TIME__ is a reserved preprocessor symbol */ + #define __TIME_H__ + -#define NULL 0 -- + -#ifndef __size_t__ -#define __size_t__ -typedef unsigned int size_t; -#endif -- --/* -- * Declarations -- */ -- --#define CLOCKS_PER_SEC 60 --typedef unsigned long int clock_t; --typedef unsigned long int time_t; --struct tm { -- int tm_sec; /* Seconds after the minute -- [0, 61] */ -- int tm_min; /* Minutes after the hour -- [0, 59] */ -- int tm_hour; /* Hours after midnight -- [0, 23] */ -- int tm_mday; /* Day of the month -- [1, 31] */ -- int tm_mon; /* Months since January -- [0, 11] */ -- int tm_year; /* Years since 1900 */ -- int tm_wday; /* Days since Sunday -- [0, 6] */ -- int tm_yday; /* Days since January 1 -- [0, 365] */ -- int tm_isdst; /* Daylight Savings Time flag */ --}; -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* -- * Time manipulation functions -- */ -- --clock_t clock(void); /* function */ ++/* ++ * Get common declarations ++ */ ++ ++#include ++#include + + /* + * Declarations +@@ -43,6 +27,9 @@ typedef unsigned int size_t; + #define CLOCKS_PER_SEC 60 + typedef unsigned long int clock_t; + typedef unsigned long int time_t; ++#ifdef powerc ++#pragma options align=power ++#endif + struct tm { + int tm_sec; /* Seconds after the minute -- [0, 61] */ + int tm_min; /* Minutes after the hour -- [0, 59] */ +@@ -54,19 +41,28 @@ struct tm { + int tm_yday; /* Days since January 1 -- [0, 365] */ + int tm_isdst; /* Daylight Savings Time flag */ + }; ++#ifdef powerc ++#pragma options align=reset ++#endif + + #ifdef __cplusplus + extern "C" { + #endif + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import on ++#endif ++ + /* + * Time manipulation functions + */ + + clock_t clock(void); /* function */ -#define clock() __tickcount() /* macro - TickCount() */ -pascal unsigned long __tickcount(void) - = 0xA975; -- --double difftime(time_t time1, time_t time0); /* function */ --#define difftime(time1,time0) ((long double)time1 - time0) /* macro */ -- --time_t mktime(struct tm *timeptr); --time_t time(time_t *timer); -- -- --/* -- * Time conversion functions -- */ -- --char *asctime (const struct tm *timeptr); --char *ctime(const time_t *timer); --struct tm *gmtime(const time_t *timer); --struct tm *localtime(const time_t *timer); --size_t strftime(char *s, size_t maxsize, -- const char *format, const struct tm *timerptr); -- --#ifdef __cplusplus --} --#endif -- --#endif ++#if !defined (__powerc) && !defined (powerc) && !defined (__CFM68K__) ++ #define clock() __tickcount() /* macro - use TickCount() */ ++ pascal unsigned long __tickcount(void) ++ = 0xA975; ++#endif /* powerc */ + + double difftime(time_t time1, time_t time0); /* function */ + #define difftime(time1,time0) ((long double)time1 - time0) /* macro */ +@@ -86,6 +82,10 @@ struct tm *localtime(const time_t *timer); + size_t strftime(char *s, size_t maxsize, + const char *format, const struct tm *timerptr); + ++#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) ++ #pragma import off ++#endif ++ + #ifdef __cplusplus + } + #endif diff --git a/Interfaces/CIncludes/Time.h.rdump b/Interfaces/CIncludes/Time.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/Time.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/Time.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0000 0018 0000 0000" /* ..Monaco........ */ -- $"0019 0000 0172 7FFF 010B 0009 000A 7FFF" /* .....r.......... */ ++ $"0009 4D6F 6E61 636F 0000 0018 066D 4FA0" /* ..Monaco.....mO. */ + $"0019 0000 0172 7FFF 010B 0009 000A 7FFF" /* .....r.......... */ - $"0116 0006 0004 0035 001B 0325 0240 0035" /* .......5...%.@.5 */ - $"001B 0325 0240 A4C6 FC0B 0000 00CE 0000" /* ...%.@.......... */ - $"00CE 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"0116 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ ++ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"0035 001B 0325 0240 0035 001B 0325 0240" /* .5...%.@.5...%.@ */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"A0AE 4FE4 3FE5 3230 0004 0000 0000 0000" /* ..O.?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -389163,8 +390120,18 @@ deleted file mode 100644 - $"7374 2043 6865 636B 496E 2028 5265 7669" /* st CheckIn (Revi */ - $"7369 6F6E 2036 2066 726F 6D20 5265 616C" /* sion 6 from Real */ - $"6974 7929 2E00" /* ity).. */ --}; -- ++data 'vers' (1) { ++ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ ++ $"3937" /* 97 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/Timer.h b/Interfaces/CIncludes/Timer.h --- a/Interfaces/CIncludes/Timer.h +++ b/Interfaces/CIncludes/Timer.h @@ -398333,17 +399300,21 @@ new file mode 100644 +}; + diff --git a/Interfaces/CIncludes/Values.h b/Interfaces/CIncludes/Values.h -deleted file mode 100644 --- a/Interfaces/CIncludes/Values.h -+++ /dev/null -@@ -1,72 +0,0 @@ ++++ b/Interfaces/CIncludes/Values.h +@@ -1,72 +1,9 @@ -/************************************************************ -- ++/* ++ File: Values.h + -Created: Monday, November 21, 1988 at 10:37 AM - Values.h - C Interface to the Macintosh Libraries -- -- ++ Copyright: © 1984-1994 by Apple Computer, Inc. ++ All rights reserved. + ++*/ + - - Copyright Apple Computer, Inc. 1985-1991 - All rights reserved @@ -398409,24 +399380,30 @@ deleted file mode 100644 -#define MAXCOMP (scalb(63,1.0)-1.0) - -#endif ++#error " is now obsolete. Use or . Please read the Release Notes." diff --git a/Interfaces/CIncludes/Values.h.rdump b/Interfaces/CIncludes/Values.h.rdump -deleted file mode 100644 --- a/Interfaces/CIncludes/Values.h.rdump -+++ /dev/null -@@ -1,26 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/CIncludes/Values.h.rdump +@@ -1,26 +1,25 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0000 0000 0000 0000" /* ..Monaco........ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0006 0004 0050 0020 032B 02BC 0050" /* .......P. .+...P */ - $"0020 032B 02BC A4C6 FADF 0000 0115 0000" /* . .+............ */ - $"0115 0000 0000 0100" /* ........ */ --}; -- --data 'MPSR' (1008) { ++ $"0009 4D6F 6E61 636F 0080 0017 0162 13C0" /* ..Monaco.....b.. */ ++ $"0162 1630 0000 0000 0096 78D0 0159 6BE8" /* .b.0......x..Yk. */ ++ $"000A 0006 0004 002A 0007 013A 027D 002A" /* .......*...:.}.* */ ++ $"0007 013A 027D AB15 BB40 0000 0000 0000" /* ...:.}...@...... */ ++ $"0000 0000 0000 0100" /* ........ */ + }; + + data 'MPSR' (1008) { - $"0050 0020 032B 02BC 0050 0020 032B 02BC" /* .P. .+...P. .+.. */ -- $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 0007 013A 027D 002A 0007 013A 027D" /* .*...:.}.*...:.} */ + $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ + }; + -data 'ckid' (128, "Projector") { - $"C790 BD85 3FE5 3230 0004 0000 0000 0000" /* ....?.20........ */ - $"0000 A933 74A9 A933 74A9 A5B5 F4B3 0008" /* ...3t..3t....... */ @@ -398438,8 +399415,18 @@ deleted file mode 100644 - $"6972 7374 2043 6865 636B 496E 2028 5265" /* irst CheckIn (Re */ - $"7669 7369 6F6E 2035 2066 726F 6D20 5265" /* vision 5 from Re */ - $"616C 6974 7929 2E00" /* ality).. */ --}; -- ++data 'vers' (1) { ++ $"0334 8000 0000 0533 2E33 2E34 2533 2E33" /* .4.....3.3.4%3.3 */ ++ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ ++ $"7574 6572 2C20 496E 632E 2031 3938 352D" /* uter, Inc. 1985- */ ++ $"3934" /* 94 */ ++}; ++ ++data 'vers' (2, purgeable) { ++ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ ++ $"2023 3233" /* #23 */ + }; + diff --git a/Interfaces/CIncludes/Video.h b/Interfaces/CIncludes/Video.h --- a/Interfaces/CIncludes/Video.h +++ b/Interfaces/CIncludes/Video.h @@ -402448,88 +403435,6 @@ new file mode 100644 + $"632E 2031 3939 372D 3230 3032" /* c. 1997-2002 */ +}; + -diff --git a/Interfaces/CIncludes/assert.h b/Interfaces/CIncludes/assert.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/assert.h -@@ -0,0 +1,40 @@ -+/************************************************************ -+ -+ Assert.h -+ Diagnostics -+ -+ Copyright © Apple Computer,Inc. 1987-1990, 1994,1995. -+ All Rights Reserved. -+ -+************************************************************/ -+ -+#undef assert -+ -+#ifdef NDEBUG -+ -+ #define assert(ignore) ((void) 0) -+ -+#else -+ -+ #if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+ #endif -+ -+ #ifdef __cplusplus -+ extern "C" { -+ #endif -+ -+ void __assertprint(const char* file, int line, const char* expr); -+ -+ #ifdef __cplusplus -+ } -+ #endif -+ -+ #define assert(expression) \ -+ ( (expression) ? (void) 0 : (__assertprint(__FILE__, __LINE__, #expression)) ) -+ -+ #if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+ #endif -+ -+#endif -diff --git a/Interfaces/CIncludes/assert.h.idump b/Interfaces/CIncludes/assert.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/assert.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/assert.h.rdump b/Interfaces/CIncludes/assert.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/assert.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 007B 434C 066C F8A0" /* ..Monaco.{CL.l.. */ -+ $"7269 6573 7D43 5341 4E45 4C69 622E 6F20" /* ries}CSANELib.o */ -+ $"B60D 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/complex.h b/Interfaces/CIncludes/complex.h --- a/Interfaces/CIncludes/complex.h +++ b/Interfaces/CIncludes/complex.h @@ -402851,152 +403756,6 @@ new file mode 100644 + $"632E 2031 3939 372D 3230 3032" /* c. 1997-2002 */ +}; + -diff --git a/Interfaces/CIncludes/ctype.h b/Interfaces/CIncludes/ctype.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/ctype.h -@@ -0,0 +1,104 @@ -+/************************************************************ -+ -+ ctype.h -+ Testing and mapping character values. -+ -+ Copyright Apple Computer,Inc. 1995 -+ All rights reserved -+ -+************************************************************/ -+ -+ -+#ifndef __CTYPE__ -+#define __CTYPE__ -+ -+#define _UPP (unsigned char)0x01 /* upper case */ -+#define _LOW (unsigned char)0x02 /* lower case */ -+#define _DIG (unsigned char)0x04 /* decimal digit */ -+#define _WSP (unsigned char)0x08 /* white space */ -+#define _PUN (unsigned char)0x10 /* punctuation */ -+#define _CTL (unsigned char)0x20 /* control */ -+#define _BLA (unsigned char)0x40 /* blank, ' ' */ -+#define _HEX (unsigned char)0x80 /* hex digit */ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+extern const char * __p_CType; -+ -+#if __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+extern int isalnum(int c); -+extern int isalpha(int c); -+extern int iscntrl(int c); -+extern int isdigit(int c); -+extern int isgraph(int c); -+extern int islower(int c); -+extern int isprint(int c); -+extern int ispunct(int c); -+extern int isspace(int c); -+extern int isupper(int c); -+extern int isxdigit(int c); -+extern int tolower(int c); -+extern int toupper(int c); -+ -+/* -+ * WARNING: These macros are not strictly ANSI compliant. They do not distinguish -+ * between EOF (-1) and 0xFF. However, since only the "C" locale is currently -+ * supported, and since in the "C" locale both EOF and 0xFF will fail all these -+ * tests, there is no pratical difference. -+ */ -+ -+#define isalnum(c) ((int)(__p_CType[(unsigned char)(c)] & (_UPP | _LOW | _DIG))) -+#define isalpha(c) ((int)(__p_CType[(unsigned char)(c)] & (_UPP | _LOW))) -+#define iscntrl(c) ((int)(__p_CType[(unsigned char)(c)] & _CTL)) -+#define isdigit(c) ((int)(__p_CType[(unsigned char)(c)] & _DIG)) -+#define isgraph(c) ((int)(__p_CType[(unsigned char)(c)] & (_UPP | _LOW | _DIG | _PUN))) -+#define islower(c) ((int)(__p_CType[(unsigned char)(c)] & _LOW)) -+#define isprint(c) ((int)(__p_CType[(unsigned char)(c)] & (_UPP | _LOW | _DIG | _PUN | _BLA))) -+#define ispunct(c) ((int)(__p_CType[(unsigned char)(c)] & _PUN)) -+#define isspace(c) ((int)(__p_CType[(unsigned char)(c)] & _WSP)) -+#define isupper(c) ((int)(__p_CType[(unsigned char)(c)] & _UPP)) -+#define isxdigit(c) ((int)(__p_CType[(unsigned char)(c)] & _HEX)) -+ -+/* -+ * Apple library extentions. The prefered mechanism for enabling these is by defining -+ * __useAppleExts__. In the absence of this symbol, the __STDC__ symbol is used to -+ * enable or disable these extentions. -+ */ -+ -+#if defined (__useAppleExts__) || \ -+ (defined (applec) && ! defined (__STDC__)) || \ -+ (defined (__PPCC__) && __STDC__ == 0) -+ -+ -+extern int isascii (int c); -+#define isascii(c) ((int)( (unsigned int) (c) <= (unsigned char)0x7F )) -+ -+/* -+ * WARNING: These macros are not strictly ANSI compliant. Strict compliance would -+ * require that, if "c" were not in the proper range, then the original value of -+ * "c" would be returned. It is the user's responsibility to ensure that "c" is -+ * in the proper range before using one of these two macros. -+ */ -+ -+#define __tolower(c) ((int)((unsigned char)(c) - (unsigned char)'A' + (unsigned char)'a')) -+#define __toupper(c) ((int)((unsigned char)(c) - (unsigned char)'a' + (unsigned char)'A')) -+ -+extern int toascii (int c); -+#define toascii(c) ((int)((unsigned char)(c) & (unsigned char)0x7F)) -+ -+#endif /* __useAppleExts__ */ -+ -+#if __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+#endif /* __CTYPE__ */ -diff --git a/Interfaces/CIncludes/ctype.h.idump b/Interfaces/CIncludes/ctype.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/ctype.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/ctype.h.rdump b/Interfaces/CIncludes/ctype.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/ctype.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0039 3837 066D 0E90" /* ..Monaco.987.m.. */ -+ $"6C6C 2072 6967 6874 7320 7265 7365 7276" /* ll rights reserv */ -+ $"6564 0006 0004 002A 0007 0156 01DD 002A" /* ed.....*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/dlpi.h b/Interfaces/CIncludes/dlpi.h new file mode 100644 --- /dev/null @@ -403045,124 +403804,6 @@ new file mode 100644 + $"632E 2031 3939 372D 3230 3032" /* c. 1997-2002 */ +}; + -diff --git a/Interfaces/CIncludes/errno.h b/Interfaces/CIncludes/errno.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/errno.h -@@ -0,0 +1,76 @@ -+/************************************************************ -+ -+ errno.h -+ Error reporting macros -+ -+ Copyright Apple Computer,Inc. 1995 -+ All rights reserved -+ -+ * Warning: Not all of these macros are a part of the ANSI C standard. -+ * This header is not POSIX compliant. -+ * The library functions are not guaranteed to set "errno" -+ * to the value of any of the non-ANSI macros. -+ * For portable code, do not use the non-ANSI macros. -+ -+ ************************************************************/ -+ -+ -+#ifndef __ERRNO__ -+#define __ERRNO__ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+/* ANSI specified declarations */ -+ -+#define EDOM 33 /* Argument outside function domain */ -+#define ERANGE 34 /* Result is too large to represent */ -+ -+extern int errno; -+ -+/* Mac specific declaration */ -+ -+extern short MacOSErr; -+ -+/* Non-ANSI macro definitions */ -+ -+#define EPERM 1 /* Operation not permitted */ -+#define ENOENT 2 /* No such file or directory */ -+#define ENORSRC 3 /* No such process */ -+#define EINTR 4 /* Interrupted function call */ -+#define EIO 5 /* Input/Output error */ -+#define ENXIO 6 /* No such device or address */ -+#define E2BIG 7 /* Argument list too long */ -+#define ENOEXEC 8 /* File not in executable format */ -+#define EBADF 9 /* Bad file descriptor (or number) */ -+#define ECHILD 10 /* No child process */ -+#define EAGAIN 11 /* Resource temporarily unavailable */ -+#define ENOMEM 12 /* Not enough space */ -+#define EACCES 13 /* File access permission denied */ -+#define EFAULT 14 /* Bad address as argument in call */ -+#define ENOTBLK 15 /* For backward compatibility */ -+#define EBUSY 16 /* System resource busy */ -+#define EEXIST 17 /* File already exists */ -+#define EXDEV 18 /* Improper link attempted */ -+#define ENODEV 19 /* No such device */ -+#define ENOTDIR 20 /* Pathname was not a directory */ -+#define EISDIR 21 /* Attempt to open directory for write */ -+#define EINVAL 22 /* Invalid argument */ -+#define ENFILE 23 /* Too many open files in system */ -+#define EMFILE 24 /* Too many open files in process */ -+#define ENOTTY 25 /* Inappropriate I/O control operation */ -+#define ETXTBSY 26 /* Text file is busy */ -+#define EFBIG 27 /* File too large */ -+#define ENOSPC 28 /* No space left on device */ -+#define ESPIPE 29 /* Invalid seek */ -+#define EROFS 30 /* Attempt to modify a read-only file */ -+#define EMLINK 31 /* Too many links on a single file */ -+#define EPIPE 32 /* Broken pipe; no process to read it */ -+ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+#endif /* __ERRNO__ */ -diff --git a/Interfaces/CIncludes/errno.h.idump b/Interfaces/CIncludes/errno.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/errno.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/errno.h.rdump b/Interfaces/CIncludes/errno.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/errno.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0000 0000 066C ACB0" /* ..Monaco.....l.. */ -+ $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -+ $"0000 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/exception.h b/Interfaces/CIncludes/exception.h new file mode 100644 --- /dev/null @@ -403249,222 +403890,6 @@ new file mode 100644 + $"2023 3233" /* #23 */ +}; + -diff --git a/Interfaces/CIncludes/fcntl.h b/Interfaces/CIncludes/fcntl.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/fcntl.h -@@ -0,0 +1,152 @@ -+/************************************************************ -+ -+ FCntl.h -+ faccess(), fcntl(), and open() mode flags. -+ -+ Copyright Apple Computer,Inc. 1995 -+ All rights reserved -+ -+ * Warning: This interface is NOT a part of the ANSI C standard. -+ * This header file is not POSIX compliant. -+ * For portable code, don't use this interface. -+ -+************************************************************/ -+ -+ -+#ifndef __FCNTL__ -+#define __FCNTL__ -+ -+ -+/* -+ * Get common declarations -+ */ -+ -+#include -+#include -+ -+ -+/* -+ * faccess() commands; for general use -+ */ -+ /* 'd' => "directory" ops */ -+#define F_DELETE (('d'<<8)|0x01) -+#define F_RENAME (('d'<<8)|0x02) -+ -+/* -+ * more faccess() commands; for use only by MPW tools -+ */ -+ -+#define F_OPEN (('d'<<8)|0x00) /* reserved for operating system use */ -+ /* 'e' => "editor" ops */ -+#define F_GTABINFO (('e'<<8)|0x00) /* get tab offset for file */ -+#define F_STABINFO (('e'<<8)|0x01) /* set " " " " */ -+#define F_GFONTINFO (('e'<<8)|0x02) /* get font number and size for file */ -+#define F_SFONTINFO (('e'<<8)|0x03) /* set " " " " " " */ -+#define F_GPRINTREC (('e'<<8)|0x04) /* get print record for file */ -+#define F_SPRINTREC (('e'<<8)|0x05) /* set " " " " */ -+#define F_GSELINFO (('e'<<8)|0x06) /* get selection information for file */ -+#define F_SSELINFO (('e'<<8)|0x07) /* set " " " " */ -+#define F_GWININFO (('e'<<8)|0x08) /* get current window position */ -+#define F_SWININFO (('e'<<8)|0x09) /* set " " " */ -+#define F_GSCROLLINFO (('e'<<8)|0x0A) /* get scroll information */ -+#define F_SSCROLLINFO (('e'<<8)|0x0B) /* set " " */ -+#define F_GMARKER (('e'<<8)|0x0D) /* Get Marker */ -+#define F_SMARKER (('e'<<8)|0x0C) /* Set " */ -+#define F_GSAVEONCLOSE (('e'<<8)|0x0F) /* Get Save on close */ -+#define F_SSAVEONCLOSE (('e'<<8)|0x0E) /* Set " " " */ -+ -+/* -+ * argument structure for use with F_SMARKER command -+ */ -+#ifdef powerc -+#pragma options align=mac68k -+#endif -+struct MarkElement { -+ int start; /* start position of mark */ -+ int end; /* end position */ -+ unsigned char charCount; /* number of chars in mark name */ -+ char name[64]; /* marker name */ -+}; /* note: marker may be up to 64 chars long */ -+ -+#ifdef powerc -+#pragma options align=reset -+#endif -+ -+#ifndef __cplusplus -+typedef struct MarkElement MarkElement; -+#endif -+ -+#ifdef powerc -+#pragma options align=mac68k -+#endif -+struct SelectionRecord { -+ long startingPos; -+ long endingPos; -+ long displayTop; -+}; -+#ifdef powerc -+#pragma options align=reset -+#endif -+#ifndef __cplusplus -+typedef struct SelectionRecord SelectionRecord; -+#endif -+ -+ -+/* -+ * Mode values accessible to open() -+ */ -+ -+#define O_RDONLY 0x00 /* Open for reading only. */ -+#define O_WRONLY 0x01 /* Open for writing only. */ -+#define O_RDWR 0x02 /* Open for reading & writing. */ -+#define O_APPEND 0x08 /* Write to the end of the file. */ -+#define O_RSRC 0x10 /* Open the resource fork. */ -+#define O_ALIAS 0x20 /* Open alias file. */ -+#define O_CREAT 0x100 /* Open or create a file. */ -+#define O_TRUNC 0x200 /* Open and truncate to zero length. */ -+#define O_EXCL 0x400 /* Create file only; fail if exists. */ -+#define O_BINARY 0x800 /* Open as a binary stream. */ -+#define O_NRESOLVE 0x4000 /* Don't resolve any aliases. */ -+ -+/* -+ * fcntl() commands -+ */ -+#define F_DUPFD 0 /* Duplicate files (file descriptor) */ -+ -+ -+typedef int ssize_t; -+typedef long off_t; -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+#if __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+/* -+ * Input and Output Primitives -+ */ -+ -+extern int open(const char *path, int oflag); -+extern int creat(const char *path); -+extern int unlink(const char *path); -+extern int faccess(const char *path, unsigned int cmd, long *arg); -+extern int dup(int fildes); /* OBSOLETE: fcntl(filedes, F_DUPFD, 0) is preferred. */ -+extern int close(int fildes); -+extern ssize_t read(int fildes, void *buf, size_t nbyte); -+extern ssize_t write(int fildes, const void *buf, size_t nbyte); -+extern int fcntl(int fildes, unsigned int cmd, int arg); -+extern off_t lseek(int fildes, off_t offset, int whence); -+ -+ -+#if __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+#endif /* __FCNTL__ */ -diff --git a/Interfaces/CIncludes/fcntl.h.idump b/Interfaces/CIncludes/fcntl.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/fcntl.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/fcntl.h.rdump b/Interfaces/CIncludes/fcntl.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/fcntl.h.rdump -@@ -0,0 +1,47 @@ -+data 'MPSR' (1006) { -+ $"0003 0000 0048 0048 0000 0000 02DA 0228" /* .....H.H.......( */ -+ $"FFE1 FFE1 02F9 0245 0347 0528 03FC 0002" /* .......E.G.(.... */ -+ $"0000 0048 0048 0000 0000 02D8 0228 0001" /* ...H.H.......(.. */ -+ $"0000 0064 0000 0001 0003 0303 0000 0001" /* ...d............ */ -+ $"270F 0001 0001 0000 0000 0000 0000 0000" /* '............... */ -+ $"0000 6008 0019 0190 0000 0000 0000 0000" /* ..`............. */ -+ $"0000 0000 0000 0001 0000 0000 0000 0000" /* ................ */ -+ $"0000 0000 0000 0000" /* ........ */ -+}; -+ -+data 'MPSR' (10000) { -+ $"0101 FFFF FFFF FFFF 0000 0820 0101 0000" /* ........... .... */ -+ $"0000 0000 0000 0000 0000 0000" /* ............ */ -+}; -+ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 000D 202A 066D 5B90" /* ..Monaco.. *.m[. */ -+ $"7469 6F6E 7320 636F 7079 7269 6768 7420" /* tions copyright */ -+ $"416D 0006 0004 002A 0007 0156 01DD 002A" /* Am.....*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1007) { -+ $"0001 0000 016F 0000 016F 175F 5F63 6653" /* .....o...o.__cfS */ -+ $"656C 6563 7469 6F6E 4F6E 456E 7472 795F" /* electionOnEntry_ */ -+ $"5F00" /* _. */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/fenv.h b/Interfaces/CIncludes/fenv.h new file mode 100644 --- /dev/null @@ -403924,132 +404349,6 @@ new file mode 100644 + $"632E 2031 3939 372D 3230 3032" /* c. 1997-2002 */ +}; + -diff --git a/Interfaces/CIncludes/float.h b/Interfaces/CIncludes/float.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/float.h -@@ -0,0 +1,84 @@ -+/************************************************************ -+ -+ Float.h -+ Characteristics of floating-point types -+ -+ Copyright Apple Computer,Inc. 1987-1990, 1993-1995 -+ All rights reserved -+ -+************************************************************/ -+ -+ -+#ifndef __FLOAT__ -+#define __FLOAT__ -+ -+ -+#define DBL_DIG 15 -+#define DBL_MANT_DIG 53 -+#define DBL_MAX_10_EXP 308 -+#define DBL_MAX_EXP 1024 -+#define DBL_MIN_10_EXP (-307) -+#define DBL_MIN_EXP (-1021) -+ -+#define FLT_DIG 7 -+#define FLT_MANT_DIG 24 -+#define FLT_MAX_10_EXP 38 -+#define FLT_MAX_EXP 128 -+#define FLT_MIN_10_EXP (-37) -+#define FLT_MIN_EXP (-125) -+ -+#define FLT_RADIX 2 -+#define FLT_ROUNDS 1 -+ -+#ifdef powerc -+ #define LDBL_DIG 15 -+ #define LDBL_MANT_DIG 53 -+ #define LDBL_MAX_10_EXP 308 -+ #define LDBL_MAX_EXP 1024 -+ #define LDBL_MIN_10_EXP (-307) -+ #define LDBL_MIN_EXP (-1021) -+#else -+ #define LDBL_DIG 19 -+ #define LDBL_MANT_DIG 64 -+ #define LDBL_MAX_10_EXP 4932 -+ #define LDBL_MAX_EXP 16384 -+ #define LDBL_MIN_10_EXP (-4931) -+ #define LDBL_MIN_EXP (-16382) -+#endif -+ -+#define DBL_EPSILON (*(double *)_DBL_EPSILON) -+#define DBL_MAX (*(double *)_DBL_MAX) -+#define DBL_MIN (*(double *)_DBL_MIN) -+#define FLT_EPSILON (*(float *)_FLT_EPSILON) -+#define FLT_MAX (*(float *)_FLT_MAX) -+#define FLT_MIN (*(float *)_FLT_MIN) -+ -+#if defined(mc68881) || defined(powerc) -+ #define LDBL_EPSILON (*(long double *)_LDBL_EPSILON) -+ #define LDBL_MAX (*(long double *)_LDBL_MAX) -+ #define LDBL_MIN (*(long double *)_LDBL_MIN) -+#else -+ #define LDBL_EPSILON (*(long double *)(_LDBL_EPSILON+1)) -+ #define LDBL_MAX (*(long double *)(_LDBL_MAX+1)) -+ #define LDBL_MIN (*(long double *)(_LDBL_MIN+1)) -+#endif -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+extern int _DBL_EPSILON[]; -+extern int _DBL_MAX[]; -+extern int _DBL_MIN[]; -+extern int _FLT_EPSILON[]; -+extern int _FLT_MAX[]; -+extern int _FLT_MIN[]; -+extern short _LDBL_EPSILON[]; -+extern short _LDBL_MAX[]; -+extern short _LDBL_MIN[]; -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+#endif -diff --git a/Interfaces/CIncludes/float.h.idump b/Interfaces/CIncludes/float.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/float.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/float.h.rdump b/Interfaces/CIncludes/float.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/float.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 003B 3B3B 066C F400" /* ..Monaco.;;;.l.. */ -+ $"3B3B 3B3B 3B3B 3B3B 3B3B 3B3B 3B3B 3B3B" /* ;;;;;;;;;;;;;;;; */ -+ $"3B3B 0006 0004 002A 0007 0156 01DD 002A" /* ;;.....*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/fp.h b/Interfaces/CIncludes/fp.h new file mode 100644 --- /dev/null @@ -407038,113 +407337,6 @@ new file mode 100644 + $"2023 3233" /* #23 */ +}; + -diff --git a/Interfaces/CIncludes/ioctl.h b/Interfaces/CIncludes/ioctl.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/ioctl.h -@@ -0,0 +1,65 @@ -+/* -+ IOCtl.h -- Device-handler-specific requests -+ -+ Warning: This interface is NOT a part of the ANSI C standard. -+ We do NOT claim to be POSIX compliant. -+ If you want your code to be portable, don't use this interface. -+ -+ Copyright, Apple Computer Inc. 1985-1991, 1995 -+ All rights reserved. -+*/ -+ -+# ifndef __IOCTL__ -+# define __IOCTL__ -+ -+ -+/* -+ * ioctl() function prototype -+ */ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+int ioctl(int fildes, unsigned int cmd, long *arg); -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+ -+/* -+ * IO Control commands. -+ * -+ * IOCTLs which begin with "FIO" are controls which are general -+ * (device driver) control requests. They may be executed by -+ * the top-level ioctl() procedure, or previewed by it before -+ * passing it on to the driver xxIoctl()s. -+ */ -+ -+# define FIOLSEEK (('f'<<8)|0x00) /* Apple internal use only */ -+# define FIODUPFD (('f'<<8)|0x01) /* Apple internal use only */ -+ -+# define FIOINTERACTIVE (('f'<<8)|0x02) /* If device is interactive */ -+# define FIOBUFSIZE (('f'<<8)|0x03) /* Return optimal buffer size */ -+# define FIOFNAME (('f'<<8)|0x04) /* Return filename */ -+# define FIOREFNUM (('f'<<8)|0x05) /* Return fs refnum */ -+# define FIOSETEOF (('f'<<8)|0x06) /* Set file length */ -+ -+/* -+ * IOCTLs which begin with "TIO" are for TTY (i.e., console or -+ * terminal-related) device control requests. -+ */ -+ -+# define TIOFLUSH (('t'<<8)|0x00) /* discard unread input. arg is ignored */ -+# define TIOSPORT (('t'<<8)|0x01) /* Obsolete -- do not use */ -+# define TIOGPORT (('t'<<8)|0x02) /* Obsolete -- do not use */ -+ -+# endif /*__IOCTL__*/ -diff --git a/Interfaces/CIncludes/ioctl.h.idump b/Interfaces/CIncludes/ioctl.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/ioctl.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/ioctl.h.rdump b/Interfaces/CIncludes/ioctl.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/ioctl.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 001B 027F 066C E9C0" /* ..Monaco.....l.. */ -+ $"027E 027F 7FFF 01DE 027D 027E 7FFF 01DF" /* .~.......}.~.... */ -+ $"001B 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/iomanip.h b/Interfaces/CIncludes/iomanip.h new file mode 100644 --- /dev/null @@ -408121,391 +408313,6 @@ new file mode 100644 + $"2023 3233" /* #23 */ +}; + -diff --git a/Interfaces/CIncludes/limits.h b/Interfaces/CIncludes/limits.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/limits.h -@@ -0,0 +1,41 @@ -+/* -+ Limits.h -- Sizes of integral types -+ -+ Copyright Apple Computer,Inc. 1987, 1990, 1994-95 -+ All rights reserved. -+ -+*/ -+ -+#ifndef __LIMITS__ -+#define __LIMITS__ -+ -+#define CHAR_BIT 8 -+#define CHAR_MAX 127 -+/* #define CHAR_MIN (-128) */ -+#define CHAR_MIN (-CHAR_MAX - 1) -+#define MB_LEN_MAX 1 -+#define INT_MAX 2147483647 -+/* #define INT_MIN (-2147483648) */ -+#define INT_MIN (-INT_MAX - 1) -+#define LONG_MAX 2147483647 -+/* #define LONG_MIN (-2147483648) */ -+#define LONG_MIN (-LONG_MAX - 1) -+#define SCHAR_MAX 127 -+#define SCHAR_MIN (-128) -+#define SHRT_MAX 32767 -+#define SHRT_MIN (-32768) -+#define UCHAR_MAX 255U -+#define UINT_MAX 4294967295U -+#define ULONG_MAX 4294967295U -+#define USHRT_MAX 65535U -+ -+#if _LONG_LONG /* Is long long supported? */ -+ -+#define LLONG_MAX 9223372036854775807LL -+#define LLONG_MIN (-LLONG_MAX - 1) -+#define ULLONG_MAX 18446744073709551615ULL -+ -+#endif /* If _LONG_LONG is supported */ -+ -+ -+#endif -diff --git a/Interfaces/CIncludes/limits.h.idump b/Interfaces/CIncludes/limits.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/limits.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/limits.h.rdump b/Interfaces/CIncludes/limits.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/limits.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0049 6E63 066D 6040" /* ..Monaco.Inc.m`@ */ -+ $"3837 0D09 416C 6C20 7269 6768 7473 2072" /* 87..All rights r */ -+ $"6573 0006 0004 002A 0007 0156 01DD 002A" /* es.....*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ -diff --git a/Interfaces/CIncludes/locale.h b/Interfaces/CIncludes/locale.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/locale.h -@@ -0,0 +1,80 @@ -+/* -+ locale.h - Localization -+ -+ Copyright Apple Computer, Inc. 1988, 1990, 1993-1995 -+ All rights reserved. -+ -+*/ -+ -+#ifndef __LOCALE__ -+#define __LOCALE__ -+ -+/* -+ * Get common declarations -+ */ -+ -+#include -+ -+/* -+ * Declarations -+ */ -+ -+#define LC_ALL 1 /* entire locale */ -+#define LC_COLLATE 2 /* strcoll and strxfrm functions */ -+#define LC_CTYPE 3 /* character handling and multibyte functions */ -+#define LC_MONETARY 4 /* monetary formatting information returned by localeconv */ -+#define LC_NUMERIC 5 /* decimal point formatting input/output and string conversions */ -+#define LC_TIME 6 /* strftime function */ -+ -+#ifdef powerc -+#pragma options align=power -+#endif -+struct lconv { -+ char *decimal_point; /* "." */ -+ char *thousands_sep; /* "" */ -+ char *grouping; /* "" */ -+ char *int_curr_symbol; /* "" */ -+ char *currency_symbol; /* "" */ -+ char *mon_decimal_point; /* "" */ -+ char *mon_thousands_sep; /* "" */ -+ char *mon_grouping; /* "" */ -+ char *positive_sign; /* "" */ -+ char *negative_sign; /* "" */ -+ char frac_digits; /* CHAR_MAX */ -+ char int_frac_digits; /* CHAR_MAX */ -+ char p_cs_precedes; /* CHAR_MAX */ -+ char p_sep_by_space; /* CHAR_MAX */ -+ char n_cs_precedes; /* CHAR_MAX */ -+ char n_sep_by_space; /* CHAR_MAX */ -+ char p_sign_posn; /* CHAR_MAX */ -+ char n_sign_posn; /* CHAR_MAX */ -+}; -+#ifdef powerc -+#pragma options align=reset -+#endif -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* -+ * functions -+ */ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+char *setlocale (int category, const char *locale); -+struct lconv *localeconv (void); -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /*__LOCALE__*/ -diff --git a/Interfaces/CIncludes/locale.h.idump b/Interfaces/CIncludes/locale.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/locale.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/locale.h.rdump b/Interfaces/CIncludes/locale.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/locale.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 00FF 0159 066D 2460" /* ..Monaco...Y.m$` */ -+ $"0000 0040 000A 0000 0000 0000 0000 0160" /* ...@...........` */ -+ $"0000 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ -diff --git a/Interfaces/CIncludes/math.h b/Interfaces/CIncludes/math.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/math.h -@@ -0,0 +1,132 @@ -+/************************************************************ -+ -+ Math.h -+ C Interface to the Macintosh Libraries -+ -+ -+ Copyright Apple Computer, Inc. 1985-1995 -+ All rights reserved -+ -+************************************************************/ -+ -+ -+#ifndef __MATH_H__ -+#define __MATH_H__ -+ -+/* -+ Strictly conforming implementations must have the parameters to these routines -+ be double, not long double. They still get evaluated to long double precision -+ on the 68K. We expect that a lot of this confusion will eventually get settled -+ by NCEG and then we will do it the NCEG way. -+*/ -+ -+#if (__STDC__ == 1) || defined(powerc) -+#define _float_eval double -+#else /*__STDC__*/ -+#define _float_eval long double -+#endif /*__STDC__*/ -+ -+#define HUGE_VAL __inf() -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* -+ * We put underscores on the formal parameter names to reduce name space pollution. -+ * Plum-Hall tests require that we do this: they have macros called exp, size etc. -+ */ -+ -+/* -+ * ANSI routines -+ */ -+ -+_float_eval sin(_float_eval _x); -+_float_eval cos(_float_eval _x); -+_float_eval tan(_float_eval _x); -+_float_eval asin(_float_eval _x); -+_float_eval acos(_float_eval _x); -+_float_eval atan(_float_eval _x); -+_float_eval atan2(_float_eval _y,_float_eval _x); -+_float_eval sinh(_float_eval _x); -+_float_eval cosh(_float_eval _x); -+_float_eval tanh(_float_eval _x); -+_float_eval exp(_float_eval _x); -+_float_eval log(_float_eval _x); -+_float_eval log10(_float_eval _x); -+_float_eval frexp(_float_eval _x,int *_exp); -+_float_eval ldexp(_float_eval _x,int _n); -+ -+_float_eval modf(_float_eval _x, _float_eval *_ip); -+ -+_float_eval pow(_float_eval _x,_float_eval _y); -+_float_eval sqrt(_float_eval _x); -+_float_eval floor(_float_eval _x); -+_float_eval ceil(_float_eval _x); -+_float_eval fmod(_float_eval _x,_float_eval _y); -+_float_eval fabs(_float_eval _x); -+ -+_float_eval __inf(void); -+ -+/* -+ * Apple extentions -+ */ -+ -+/* CFront can't handle the pretty version of this conditional -+#if defined (__useAppleExts__) || \ -+ ((defined (applec) && ! defined (__STDC__)) || \ -+ (defined (__PPCC__) && __STDC__ == 0)) -+*/ -+#if defined (__useAppleExts__) || ((defined (applec) && ! defined (__STDC__)) || (defined (__PPCC__) && __STDC__ == 0)) -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+char *ecvt(extended value,int ndigit,int *decpt,int *sign); /* Imported from StdCLib. */ -+char *fcvt(extended value,int ndigit,int *decpt,int *sign); /* Imported from StdCLib. */ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+_float_eval hypot(_float_eval _x,_float_eval _y); -+ -+ -+#ifdef powerc -+/* -+ * If you use modf() you must decide which version you mean: modf(), -+ * modff() or modfl(). The usual promotions to long double don't -+ * help here because we're using a pointer. -+ * -+ * NOTE: both modff() and modfl() are not ANSI defined functions; -+ * if you use it, your code may not be portable. -+ */ -+ -+float modff(float _x,float *_ip); -+long double modfl(long double _x, long double *_ip); -+ -+#else -+/* -+ * For the 68K, these are defined as macros which evaluate to modf(), -+ * since for the 68K world there is no difference between modf(), modff(), -+ * and modfl(). (Functional implementations are also provided if you are -+ * linking with MathLib.o. If you link with CSANELib.o and Math.o, -+ * attempting to use the function instead of the macro will cause link -+ * errors as these are not available as functions in the older SANE engine.) -+ */ -+ -+float modff(float _x,float *_ip); -+#define modff(_x,_ip) modf(_x,_ip) -+long double modfl(long double _x, long double *_ip); -+#define modfl(_x,_ip) modf(_x,_ip) -+ -+#endif /* powerc */ -+ -+#endif /* __useAppleExts__ */ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* __MATH_H__ */ -diff --git a/Interfaces/CIncludes/math.h.idump b/Interfaces/CIncludes/math.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/math.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/math.h.rdump b/Interfaces/CIncludes/math.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/math.h.rdump -@@ -0,0 +1,31 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 002A 2A2A 066D 3450" /* ..Monaco.***.m4P */ -+ $"7265 6174 6564 3A20 4672 6964 6179 2C20" /* reated: Friday, */ -+ $"5365 0006 0004 002A 0007 0156 01DD 002A" /* Se.....*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1007) { -+ $"0001 0000 0000 0000 0000 175F 5F63 6653" /* ...........__cfS */ -+ $"656C 6563 7469 6F6E 4F6E 456E 7472 795F" /* electionOnEntry_ */ -+ $"5F00" /* _. */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/miioccom.h b/Interfaces/CIncludes/miioccom.h new file mode 100644 --- /dev/null @@ -408767,144 +408574,6 @@ new file mode 100644 + $"2023 3233" /* #23 */ +}; + -diff --git a/Interfaces/CIncludes/perf.h b/Interfaces/CIncludes/perf.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/perf.h -@@ -0,0 +1,97 @@ -+/************************************************************ -+ -+ Perf.h -+ -+ version 2.0 -+ C Interface to PerformLib.o -+ -+ Copyright Apple Computer, Inc. 1986-1996 -+ All rights reserved -+ -+************************************************************/ -+ -+ -+#ifndef __PERF__ -+#define __PERF__ -+ -+#ifndef __TYPES__ -+#include -+#endif -+ -+#ifndef __CONDITIONALMACROS__ -+#include -+#endif -+ -+#if GENERATINGPOWERPC -+#error "Perf.h is only valid for 680x0 code." -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+struct TPerfGlobals { -+ long startROM; /*ROM Base*/ -+ long romHits; /*used if MeasureROM is false*/ -+ long misses; /*count of PC values outside measured memory*/ -+ long (*segArray)[1]; /*array of segment handles*/ -+ long (*sizeArray)[1]; /*array of segment sizes*/ -+ short (**idArray)[1]; /*array of segment rsrc IDs*/ -+ long (*baseArray)[1]; /*array of offsets to counters for each segment*/ -+ long (*samples)[1]; /*samples buffer*/ -+ long buffSize; /*size of samples buffer in bytes*/ -+ short timeInterval; /*number of clock intervals between interrupts*/ -+ short bucketSize; /*size of buckets power of 2*/ -+ short log2buckSize; /*used in CvtPC*/ -+ short pcOffset; /*offset to the user PC at interrupt time.*/ -+ short numMeasure; /*# Code segments (w/o jump table)- ROM etc.*/ -+ short firstCode; /*index of first Code segment*/ -+ Boolean takingSamples; /*true if sampling is enabled.*/ -+ Boolean measureROM; -+ Boolean measureCode; -+ short ramSeg; /*index of "segment" record to cover RAM > 0 if RAM (misses) are to be bucketed.*/ -+ long ramBase; /*beginning of RAM being measured.*/ -+ short measureRAMbucketSize; -+ short measureRAMlog2buckSize; -+ short romVersion; -+ short vRefNum; /*Volume where the report file is to be created*/ -+ Boolean volumeSelected; /*True if user selects the report file name*/ -+ Str255 rptFileName; /*Report file name*/ -+ Str255 rptFileCreator; /*Report File Creator*/ -+ Str255 rptFileType; /*Report File type*/ -+ ResType getResType; /*Resource type*/ -+}; -+ -+typedef struct TPerfGlobals TPerfGlobals; -+typedef TPerfGlobals *TP2PerfGlobals; -+ -+/* PerfGlobals are declared as a record, so main program can allocate -+as globals, desk accessory can add to globals allocated via pointer, -+print driver can allocate via low memory, etc. */ -+ -+pascal Boolean InitPerf(TP2PerfGlobals *thePerfGlobals,short timerCount, -+ short codeAndROMBucketSize,Boolean doROM,Boolean doAppCode,const Str255 appCodeType, -+ short romID,const Str255 romName,Boolean doRAM,long ramLow,long ramHigh, -+ short ramBucketSize); -+ -+/* called once to setup Performance monitoring */ -+ -+pascal void TermPerf(TP2PerfGlobals thePerfGlobals); -+ -+/* if InitPerf succeeds then TermPerf must be called before terminating program. */ -+ -+pascal Boolean PerfControl(TP2PerfGlobals thePerfGlobals,Boolean turnOn); -+ -+/* -+ Call this to turn off/on measuring. -+ Returns previous state. -+*/ -+ -+pascal short PerfDump(TP2PerfGlobals thePerfGlobals,const Str255 reportFile, -+ Boolean doHistogram,short rptFileColumns); /* Call this to dump the statistics into a file. */ -+ -+#ifdef __cplusplus -+} /* extern c */ -+#endif -+ -+#endif -diff --git a/Interfaces/CIncludes/perf.h.idump b/Interfaces/CIncludes/perf.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/perf.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/perf.h.rdump b/Interfaces/CIncludes/perf.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/perf.h.rdump -@@ -0,0 +1,24 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0068 7572 0125 7FD0" /* ..Monaco.hur.%.. */ -+ $"2C20 5365 7074 656D 6265 7220 372C 2031" /* , September 7, 1 */ -+ $"3938 0006 0004 002A 0003 01CA 023C 002A" /* 98.....*.....<.* */ -+ $"0003 01CA 023C ADB8 D729 0000 004A 0000" /* .....<...)...J.. */ -+ $"004A 0000 0000 0100" /* .J...... */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0003 01CA 023C 002A 0003 01CA 023C" /* .*.....<.*.....< */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0200 8000 0000 0332 2E30 2332 2E30 2C20" /* .......2.0#2.0, */ -+ $"A920 4170 706C 6520 436F 6D70 7574 6572" /* . Apple Computer */ -+ $"2C20 496E 632E 2031 3938 362D 3936" /* , Inc. 1986-96 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/pipestream.h b/Interfaces/CIncludes/pipestream.h new file mode 100644 --- /dev/null @@ -408960,371 +408629,6 @@ new file mode 100644 + $"2023 3233" /* #23 */ +}; + -diff --git a/Interfaces/CIncludes/setjmp.h b/Interfaces/CIncludes/setjmp.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/setjmp.h -@@ -0,0 +1,45 @@ -+/* -+ SetJmp.h -+ -+ Copyright Apple Computer, Inc. 1986-1990, 1993-1995 -+ All rights reserved. -+ */ -+ -+ -+#ifndef __SETJMP__ -+#define __SETJMP__ -+ -+#ifdef __CFM68K__ -+ /* We MUST use the new, larger jmp_buf for CFM-68K */ -+ #undef OLD_JMPBUF -+#endif -+ -+#if defined (powerc) -+ typedef long *jmp_buf[64]; /* PowerPC: LR,CR,SP,TOC,RESVD,R13-R31,FP14-FP31,FPSCR,RESVD,RESVD */ -+#elif defined (OLD_JMPBUF) -+ typedef long *jmp_buf[12]; /* old 68K: D2-D7,PC,A2-A4,A6,SP */ -+#else -+ typedef long *jmp_buf[16]; /* new 68K: D2-D7,PC,A2-A4,A6,SP,FLAGS,A5,RESVD,RESVD */ -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+int __setjmp(jmp_buf env); -+#define setjmp(env) __setjmp(env) -+void longjmp(jmp_buf env, int val); -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff --git a/Interfaces/CIncludes/setjmp.h.idump b/Interfaces/CIncludes/setjmp.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/setjmp.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/setjmp.h.rdump b/Interfaces/CIncludes/setjmp.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/setjmp.h.rdump -@@ -0,0 +1,31 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0000 0000 066D 33A0" /* ..Monaco.....m3. */ -+ $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -+ $"0000 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1007) { -+ $"0001 0000 0317 0000 0317 175F 5F63 6653" /* ...........__cfS */ -+ $"656C 6563 7469 6F6E 4F6E 456E 7472 795F" /* electionOnEntry_ */ -+ $"5F00" /* _. */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ -diff --git a/Interfaces/CIncludes/signal.h b/Interfaces/CIncludes/signal.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/signal.h -@@ -0,0 +1,69 @@ -+/* -+ Signal.h -- Signal handling -+ -+ Copyright Apple Computer,Inc. 1988, 1990, 1995 -+ All rights reserved. -+ -+*/ -+ -+#ifndef __SIGNAL__ -+#define __SIGNAL__ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+typedef int sig_atomic_t; -+ -+typedef void ( *__sigfun )( int __sig ); -+ -+/* -+ * Special signal handlers, compatible with the second argument to signal() -+ * or, in the case of SIG_ERR, the return value from signal(). -+ */ -+ -+#define SIG_DFL (( __sigfun ) 1) -+#define SIG_ERR (( __sigfun ) -1) -+#define SIG_IGN (( __sigfun ) 0) -+#define SIG_HOLD (( __sigfun ) 3) -+#define SIG_RELEASE (( __sigfun ) 5) -+ -+ -+/* -+ * Signal numbers for specific conditions. -+ */ -+ -+#define SIGABRT (1<<0) /* Abnormal termination e.g. by the abort() function */ -+#define SIGFPE (1<<2) /* Arithmetic exception -- not currently implemented */ -+#define SIGILL (1<<3) /* Illegal instruction -- not currently implemented */ -+#define SIGINT (1<<1) /* Interactive attention signal -- User interrupt via CMD-. */ -+#define SIGSEGV (1<<4) /* Segmentation violation -- not currently implemented */ -+#define SIGTERM (1<<5) /* Termination request -- not currently implemented */ -+ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+/* -+ * Specify a signal handling function. -+ */ -+ -+extern __sigfun signal(int sig, __sigfun func); -+ -+ -+/* -+ * Send a signal. -+ */ -+ -+extern int raise (int sig); -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff --git a/Interfaces/CIncludes/signal.h.idump b/Interfaces/CIncludes/signal.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/signal.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/signal.h.rdump b/Interfaces/CIncludes/signal.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/signal.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0001 2208 066D 2570" /* ..Monaco.."..m%p */ -+ $"000A 0157 0249 009E 0052 0249 7FFF 00A9" /* ...W.I...R.I.... */ -+ $"000A 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ -diff --git a/Interfaces/CIncludes/stdarg.h b/Interfaces/CIncludes/stdarg.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stdarg.h -@@ -0,0 +1,41 @@ -+/* -+ StdArg.h -- Variable arguments -+ -+ Copyright Apple Computer,Inc. 1987, 1990, 1994, 1995 -+ All rights reserved. -+ -+*/ -+ -+ -+#ifndef __STDARG__ -+#define __STDARG__ -+ -+/* -+ * Get common declarations -+ */ -+ -+#include -+#include -+#include -+ -+#if __spillargs -+ /* "__spillargs" needed for PowerMac register-based calling conventions. */ -+ /* When using other preprocessors other than MrC, simply define "__spillargs". */ -+ #undef __spillargs -+ extern int __spillargs; -+ #define va_start(ap, parmN) ap = (__spillargs, (va_list)((unsigned int)&(parmN) + (((sizeof(parmN)+3)/4)*4))) -+ -+#elif !defined (__SC__) || defined (__CFM68K__) || defined(__MRC__) -+ /* most normal compilers are long-word aligned… */ -+ #define va_start(ap, parmN) ap = (va_list)((unsigned int)&(parmN) + (((sizeof(parmN)+3)/4)*4)) -+ -+#else -+ /* …but Symantec C is word aligned. */ -+ #define va_start(ap, parmN) ap = (va_list)((char*)&parmN + (((sizeof(parmN)+1)/2)*2)) -+#endif -+ -+#define va_arg(ap, type) ((type *)(ap += sizeof (type)))[-1] -+#define va_end(ap) /* do nothing */ -+ -+ -+#endif -diff --git a/Interfaces/CIncludes/stdarg.h.idump b/Interfaces/CIncludes/stdarg.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stdarg.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/stdarg.h.rdump b/Interfaces/CIncludes/stdarg.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stdarg.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 000E 0009 066D 5DB0" /* ..Monaco.....m]. */ -+ $"00DF 00E1 00DF 00E2 00EA 00E1 00EA 00E2" /* ................ */ -+ $"0000 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ -diff --git a/Interfaces/CIncludes/stddef.h b/Interfaces/CIncludes/stddef.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stddef.h -@@ -0,0 +1,36 @@ -+/* -+ StdDef.h -- Common definitions -+ -+ Copyright Apple Computer,Inc. 1987-1990, 1994, 1995 -+ All rights reserved. -+ -+ -+*/ -+ -+#if ! defined (__STDDEF__) -+#define __STDDEF__ -+ -+/* -+ NULL - this macro is defined by several ANSI headers and Types.h -+*/ -+ -+#include -+ -+/* -+ size_t - this type is defined by several ANSI headers. -+*/ -+ -+#include -+ -+/* -+ wchar_t - this type is defined only by stddef and stdlib. -+*/ -+ -+#include -+ -+/* Definitions unique to stddef.h */ -+ -+typedef int ptrdiff_t; -+#define offsetof(structure,field) ((size_t)&((structure *) 0)->field) -+ -+#endif -diff --git a/Interfaces/CIncludes/stddef.h.idump b/Interfaces/CIncludes/stddef.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stddef.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/stddef.h.rdump b/Interfaces/CIncludes/stddef.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stddef.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0020 436F 066D 3B30" /* ..Monaco. Co.m;0 */ -+ $"6572 2C49 6E63 2E09 3139 3837 0D09 416C" /* er,Inc..1987..Al */ -+ $"6C20 0006 0004 002A 0007 0156 01DD 002A" /* l .....*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/stdexcept.h b/Interfaces/CIncludes/stdexcept.h new file mode 100644 --- /dev/null @@ -409446,348 +408750,6 @@ new file mode 100644 + $"2023 3233" /* #23 */ +}; + -diff --git a/Interfaces/CIncludes/stdio.h b/Interfaces/CIncludes/stdio.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stdio.h -@@ -0,0 +1,289 @@ -+/************************************************************ -+ -+ stdio.h -+ Standard input and output. -+ -+ Copyright Apple Computer,Inc. 1995 -+ All rights reserved -+ -+************************************************************/ -+ -+ -+#ifndef __STDIO__ -+#define __STDIO__ -+ -+/* -+ * Include common declarations -+ */ -+ -+#include -+#include -+#include -+#include -+ -+ -+/* -+ * The basic data structure for a stream is the FILE type. -+ */ -+ -+#ifdef powerc -+#pragma options align=power -+#endif -+struct FILE { -+ int _cnt; -+ unsigned char *_ptr; -+ unsigned char *_base; -+ unsigned char *_end; -+ unsigned short _size; -+ unsigned short _flag; -+ unsigned short _file; -+}; -+#ifdef powerc -+#pragma options align=reset -+#endif -+ -+typedef struct FILE FILE; -+ -+ -+/* -+ * The type to uniquely specify the position in a file, returned by fgetpos(). -+ */ -+ -+typedef long fpos_t; -+ -+ -+/* -+ * Values for various bits of a FILE's _flag field. -+ * The values _IOFBF, _IOLBF, and _IONBF can be used as the -+ * third argument to setvbuf(); -+ */ -+ -+#define _IOFBF 0x00 /* File is fully buffered */ -+#define _IOREAD 0x01 /* File is open for Reading */ -+#define _IOWRT 0x02 /* File is open for Writing */ -+#define _IONBF 0x04 /* File I/O is unbuffered */ -+#define _IOMYBUF 0x08 /* Buffer allocated by stdio */ -+#define _IOEOF 0x10 /* End of file reached */ -+#define _IOERR 0x20 /* I/O error has occurred */ -+#define _IOLBF 0x40 /* File is line buffered */ -+#define _IORW 0x80 /* File is open for Read/Write */ -+#define _IOSYNC 0x100 /* Flush output on Read */ -+#define _IOBINARY 0x200 /* For backward compatibility */ -+#define _IOBACK 0x4000 /* For backward compatibility */ -+ -+ -+/* -+ * The default buffer sizes for a fully buffered or line buffered file. -+ */ -+ -+#define BUFSIZ 1024 -+#define _LBFSIZ 254 -+ -+ -+/* -+ * The normal end-of-file indicator. -+ */ -+ -+#define EOF (-1) -+ -+ -+/* -+ * FOPEN_MAX is the minimum number of files that a program is guaranteed to be able -+ * to have open simultaneously (including the pre-opened stdin, stdout, and stderr). -+ * The numbers are listed in Inside Macintosh, page IV-178, as: -+ * 64K ROM, 128K Macintosh 12 files -+ * 64K ROM, 512K Macintosh 40 files -+ * 128K ROM 40 files per volume -+ * -+ * FILENAME_MAX is the maximum length of a file name, including a trailing zero byte. -+ */ -+ -+#define FOPEN_MAX 12 -+#define FILENAME_MAX 32 -+ -+ -+/* -+ * L_tmpnam is the size of char array long enough to hold a temporary file name -+ * generated by tmpnam(), including the trailing null byte. The name is in the -+ * form tmp.AAAXXXXXX, where AAA is a sequence of lower case letters ("aaa", "baa", -+ * ... "zzz" on successive calls), and XXXXXX is a lower case letter followed by a sequence -+ * of digits, all determined at runtime. -+ */ -+ -+#define L_tmpnam 14 -+ -+ -+/* -+ * TMP_MAX is the number of distinct file names that tmpnam() can generate. -+ */ -+ -+#define TMP_MAX 17576 -+ -+ -+/* -+ * The standard predefined streams: error, input, and output -+ */ -+ -+#define stdin (&_iob[0]) -+#define stdout (&_iob[1]) -+#define stderr (&_iob[2]) -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+/* -+ * Operations on Files -+ */ -+ -+extern int remove (const char *filename); -+extern int rename (const char *oldname, const char *newname); -+extern FILE *tmpfile (void); -+extern char *tmpnam (char *s); -+ -+ -+/* -+ * File Access Functions -+ */ -+ -+extern int fclose (FILE *stream); -+extern int fflush (FILE *stream); -+extern FILE *fopen (const char *filename, const char *mode); -+extern FILE *freopen (const char *filename, const char *mode, FILE *stream); -+extern void setbuf (FILE *stream, char *buf); -+extern int setvbuf (FILE *stream, char *buf, int mode, size_t size); -+ -+ -+/* -+ * Formatted Input/Output Functions -+ */ -+ -+extern int fprintf (FILE *stream, const char *format, ...); -+extern int fscanf (FILE *stream, const char *format, ...); -+extern int printf (const char *format, ...); -+extern int scanf (const char *format, ...); -+extern int sprintf (char *s, const char *format, ...); -+extern int sscanf (const char *s, const char *format, ...); -+extern int vfprintf (FILE *stream, const char *format, va_list arg); -+extern int vprintf (const char *format, va_list arg); -+extern int vsprintf (char *s, const char *format, va_list arg); -+ -+ -+/* -+ * Character Input/Output Functions -+ */ -+ -+extern int fgetc (FILE *stream); -+extern char *fgets (char *s, int n, FILE *stream); -+extern int fputc (int c, FILE *stream); -+extern int fputs (const char *s, FILE *stream); -+extern int getc (FILE *stream); -+extern int getchar (void); -+extern char *gets (char *s); -+extern int putc (int c, FILE *stream); -+extern int putchar (int c); -+extern int puts (const char *s); -+extern int ungetc (int c, FILE *stream); -+ -+/* -+ * WARNING!! -+ * -+ * These macros evaluate their arguments more than once. -+ * Be sure that evaluation of the "s" argument has no side effects. -+ * -+ * For example, using "getc(mychar++)" would cause "mychar" to be -+ * incremented twice. -+ * -+ * To avoid this, either assign "mychar" to a temporary, or put the -+ * function name in paranthesis, so that the macro is not envoked: -+ * "(getc)(mychar++)" -+ * -+ */ -+ -+#define getc(s) (--(s)->_cnt >= 0 ? (int) *(s)->_ptr++ : _filbuf(s)) -+#define getchar() (getc(stdin)) -+#define putc(c, s) (--(s)->_cnt >= 0 ? \ -+ ((int) (*(s)->_ptr++ = (unsigned char) (c))) : \ -+ _flsbuf((unsigned char) (c), (s))) -+#define putchar(c) (putc((c), stdout)) -+ -+ -+/* -+ * Direct Input/Output Functions -+ */ -+ -+extern size_t fread (void *ptr, size_t size, size_t nmemb, FILE *stream); -+extern size_t fwrite (const void *ptr, size_t size, size_t nmemb, FILE *stream); -+ -+ -+/* -+ * File Positioning Functions -+ */ -+ -+extern int fgetpos (FILE *stream, fpos_t *pos); -+extern int fseek (FILE *stream, long int offset, int whence); -+extern int fsetpos (FILE *stream, const fpos_t *pos); -+extern long int ftell (FILE *stream); -+extern void rewind (FILE *stream); -+ -+ -+/* -+ * Error Handling Functions -+ */ -+ -+extern void clearerr (FILE *stream); -+extern int feof (FILE *stream); -+extern int ferror (FILE *stream); -+extern void perror (const char *s); -+ -+#define clearerr(s) ((void)((s)->_flag &= ~(_IOERR | _IOEOF))) -+#define feof(s) ((s)->_flag & _IOEOF) -+#define ferror(s) ((s)->_flag & _IOERR) -+ -+ -+/* -+ * Internal structures exposed by previous macro definitions. -+ */ -+ -+extern FILE _iob[]; /* Array of FILE control blocks. */ -+#define _NFILE 40 /* Size of _iob. */ -+ -+extern int _filbuf(FILE *); -+extern int _flsbuf(unsigned char, FILE *); -+ -+ -+/* -+ * Non-ANSI extensions -+ * -+ * The prefered mechanism for enabling these is by defining __useAppleExts__. -+ * In the absence of this symbol, the __STDC__ symbol is used to enable or -+ * disable these extentions. -+ */ -+ -+#if defined (__useAppleExts__) || \ -+ (defined (applec) && ! defined (__STDC__)) || \ -+ (defined (__PPCC__) && __STDC__ == 0) -+ -+#define fileno(p) (p)->_file -+ -+extern FILE *fdopen(int fildes, const char *mode); -+extern void fsetfileinfo (const char *filename, unsigned long newcreator, unsigned long newtype); -+extern int getw(FILE *stream); -+extern int putw(int w, FILE *stream); -+ -+#endif -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* __STDIO__ */ -diff --git a/Interfaces/CIncludes/stdio.h.idump b/Interfaces/CIncludes/stdio.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stdio.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/stdio.h.rdump b/Interfaces/CIncludes/stdio.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stdio.h.rdump -@@ -0,0 +1,36 @@ -+data 'MPSR' (10000) { -+ $"0101 FFFF FFFF FFFF 0000 0820 0101 0000" /* ........... .... */ -+ $"0000 0000 0000 0000 0000 0000" /* ............ */ -+}; -+ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 006E 632E 066D 7970" /* ..Monaco.nc..myp */ -+ $"3835 290D 0941 6C6C 2052 6967 6874 7320" /* 85)..All Rights */ -+ $"5265 0006 0004 002A 0007 0156 01DD 002A" /* Re.....*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1007) { -+ $"0001 0000 1BE2 0000 1C44 175F 5F63 6653" /* .........D.__cfS */ -+ $"656C 6563 7469 6F6E 4F6E 456E 7472 795F" /* electionOnEntry_ */ -+ $"5F00" /* _. */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/stdiostream.h b/Interfaces/CIncludes/stdiostream.h new file mode 100644 --- /dev/null @@ -409899,226 +408861,6 @@ new file mode 100644 + $"2023 3233" /* #23 */ +}; + -diff --git a/Interfaces/CIncludes/stdlib.h b/Interfaces/CIncludes/stdlib.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stdlib.h -@@ -0,0 +1,178 @@ -+/* -+ StdLib.h -- General utilities -+ -+ Copyright Apple Computer,Inc. 1987, 1990, 1993-1995 -+ All rights reserved. -+ -+*/ -+ -+ -+#ifndef __STDLIB__ -+#define __STDLIB__ -+ -+/* -+ * Get common declarations -+ */ -+ -+#include -+#include -+#include -+ -+#ifdef powerc -+#pragma options align=power -+#endif -+struct div_t { -+ int quot; /* quotient */ -+ int rem; /* remainder */ -+} ; -+#ifdef powerc -+#pragma options align=reset -+#endif -+typedef struct div_t div_t; -+ -+#ifdef powerc -+#pragma options align=power -+#endif -+struct ldiv_t { -+ long int quot; /* quotient */ -+ long int rem; /* remainder */ -+}; -+#ifdef powerc -+#pragma options align=reset -+#endif -+typedef struct ldiv_t ldiv_t; -+ -+#define EXIT_FAILURE 1 -+#define EXIT_SUCCESS 0 -+ -+#define RAND_MAX 32767 -+ -+#define MB_CUR_MAX 1 -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+ -+/* -+ * String conversion functions -+ */ -+ -+double atof (const char *nptr); -+int atoi (const char *nptr); -+long int atol (const char *nptr); -+double strtod (const char *nptr, char **endptr); -+long int strtol (const char *nptr, char **endptr, int base); -+unsigned long int strtoul (const char *nptr, char **endptr, int base); -+ -+ -+/* -+ * Pseudo-random sequence generation functions -+ */ -+ -+int rand (void); -+void srand (unsigned int seed); -+ -+ -+/* -+ * Memory management functions -+ */ -+ -+void *calloc (size_t nmemb, size_t size); -+void free (void *ptr); -+void *malloc (size_t size); -+void *realloc (void *ptr, size_t size); -+ -+ -+/* -+ * Communication with the environment -+ */ -+ -+void abort (void); -+int atexit (void (*func)(void)); -+void exit (int status); -+char *getenv (const char *name); -+int system (const char *string); -+ -+ -+/* -+ * Searching and sorting utilities -+ */ -+ -+void *bsearch (const void *key, const void *base, -+ size_t nmemb, size_t size, -+ int (*compar)(const void *, const void *)); -+void qsort (void *base, size_t nmemb, size_t size, -+ int (*compar)(const void *, const void *)); -+ -+ -+/* -+ * Integer arithmetic functions -+ */ -+ -+int abs (int j); -+div_t div (int numer, int denom); -+long int labs (long int j); -+ldiv_t ldiv (long int numer, long int denom); -+ -+ -+/* -+ * Multibyte functions -+ */ -+ -+int mblen (const char *s, size_t n); -+int mbtowc (wchar_t *pwc, const char *s, size_t n); -+int wctomb (char *s, wchar_t wchar); -+size_t mbstowcs (wchar_t *pwcs, const char *s, size_t n); -+size_t wcstombs (char *s, const wchar_t *pwcs, size_t n); -+ -+/* -+ * Apple extentions -+ */ -+ -+/* CFront can't handle the pretty version of this conditional -+#if defined (__useAppleExts__) || \ -+ ((defined (applec) && ! defined (__STDC__)) || \ -+ (defined (__PPCC__) && __STDC__ == 0)) -+*/ -+#if defined (__useAppleExts__) || ((defined (applec) && ! defined (__STDC__)) || (defined (__PPCC__) && __STDC__ == 0)) -+ -+void _exit (int status); -+int setenv(const char *varName, const char *value); -+#define putenv(x, y) setenv((x), (y)) -+ -+#endif -+ -+#if _LONG_LONG /* Is long long supported? */ -+ -+struct lldiv_t { -+ long long int quot; /* quotient */ -+ long long int rem; /* remainder */ -+}; -+ -+typedef struct lldiv_t lldiv_t; -+ -+long long int llabs (long long int j); -+lldiv_t lldiv (long long int numer, long long int denom); -+long long int strtoll (const char *nptr, char **endptr, int base); -+unsigned long long int strtoull (const char *nptr, char **endptr, int base); -+long long int atoll (const char *nptr); -+ -+#endif /* If _LONG_LONG is supported */ -+ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff --git a/Interfaces/CIncludes/stdlib.h.idump b/Interfaces/CIncludes/stdlib.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stdlib.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/stdlib.h.rdump b/Interfaces/CIncludes/stdlib.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/stdlib.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 004E 000C 066D 73C0" /* ..Monaco.N...ms. */ -+ $"7FFF 0000 002C 0001 027E 0024 0000 0000" /* .....,...~.$.... */ -+ $"010E 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ -+ $"0007 0156 01DD AF17 E24F 0000 0000 0000" /* ...V.....O...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/stream.h b/Interfaces/CIncludes/stream.h new file mode 100644 --- /dev/null @@ -410170,159 +408912,6 @@ new file mode 100644 + $"2023 3233" /* #23 */ +}; + -diff --git a/Interfaces/CIncludes/string.h b/Interfaces/CIncludes/string.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/string.h -@@ -0,0 +1,105 @@ -+/************************************************************ -+ -+ String.h -+ String handling -+ -+ Copyright Apple Computer,Inc. 1987-1990, 1993-1996 -+ All rights reserved -+ -+************************************************************/ -+ -+ -+#ifndef __STRING__ -+#define __STRING__ -+ -+/* -+ * Get common declarations -+ */ -+ -+#include -+#include -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+/* -+ * Copying functions -+ */ -+ -+void *memcpy (void *s1, const void *s2, size_t n); -+void *memmove (void *s1, const void *s2, size_t n); -+char *strcpy (char *s1, const char *s2); -+char *strncpy (char *s1, const char *s2, size_t n); -+ -+/* Apple library extentions. The prefered mechanism for enabling these is by defining -+ * __useAppleExts__. In the absence of this symbol, the __STDC__ symbol is used to -+ * enable or disable these extentions. */ -+ -+/* CFront can't handle the pretty version of this conditional -+#if defined (__useAppleExts__) || \ -+ ((defined (applec) && ! defined (__STDC__)) || \ -+ (defined (__PPCC__) && __STDC__ == 0)) -+*/ -+#if defined (__useAppleExts__) || ((defined (applec) && ! defined (__STDC__)) || (defined (__PPCC__) && __STDC__ == 0)) -+ -+void *memccpy(void *s1, const void *s2, int c, size_t n); -+ -+#endif -+ -+/* -+ * Concatenation functions -+ */ -+ -+char *strcat (char *s1, const char *s2); -+char *strncat (char *s1, const char *s2, size_t n); -+ -+/* -+ * Comparison functions -+ */ -+ -+int memcmp (const void *s1, const void *s2, size_t n); -+int strcmp (const char *s1, const char *s2); -+int strcoll (const char *s1, const char *s2); -+int strncmp (const char *s1, const char *s2, size_t n); -+size_t strxfrm (char *s1, const char *s2, size_t n); -+ -+ -+/* -+ * Search functions -+ */ -+ -+void *memchr (const void *s, int c, size_t n); -+char *strchr (const char *s, int c); -+size_t strcspn (const char *s1, const char *s2); -+char * strpbrk (const char *s1, const char *s2); -+char *strrchr (const char *s, int c); -+size_t strspn (const char *s1, const char *s2); -+char *strstr (const char *s1, const char *s2); -+char *strtok (char *s1, const char *s2); -+ -+ -+/* -+ * Miscellaneous functions -+ */ -+ -+void *memset (void *s, int c, size_t n); -+char *strerror (int errnum); -+size_t strlen (const char *s); -+ -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff --git a/Interfaces/CIncludes/string.h.idump b/Interfaces/CIncludes/string.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/string.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/string.h.rdump b/Interfaces/CIncludes/string.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/string.h.rdump -@@ -0,0 +1,31 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0001 01F8 066D 1F00" /* ..Monaco.....m.. */ -+ $"0040 000C 0040 01E9 013F 000C 013F 01E9" /* .@...@...?...?.. */ -+ $"01D2 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1007) { -+ $"0001 0000 0000 0000 0000 175F 5F63 6653" /* ...........__cfS */ -+ $"656C 6563 7469 6F6E 4F6E 456E 7472 795F" /* electionOnEntry_ */ -+ $"5F00" /* _. */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/strlog.h b/Interfaces/CIncludes/strlog.h new file mode 100644 --- /dev/null @@ -410681,141 +409270,6 @@ new file mode 100644 + $"632E 2031 3939 372D 3230 3032" /* c. 1997-2002 */ +}; + -diff --git a/Interfaces/CIncludes/time.h b/Interfaces/CIncludes/time.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/time.h -@@ -0,0 +1,93 @@ -+/************************************************************ -+ -+ Time.h -+ Date and time -+ -+ Copyright © Apple Computer,Inc. 1987-1991, 1993, 1994. -+ All Rights Reserved. -+ -+************************************************************/ -+ -+ -+#ifndef __TIME_H__ /* __TIME__ is a reserved preprocessor symbol */ -+#define __TIME_H__ -+ -+ -+/* -+ * Get common declarations -+ */ -+ -+#include -+#include -+ -+/* -+ * Declarations -+ */ -+ -+#define CLOCKS_PER_SEC 60 -+typedef unsigned long int clock_t; -+typedef unsigned long int time_t; -+#ifdef powerc -+#pragma options align=power -+#endif -+struct tm { -+ int tm_sec; /* Seconds after the minute -- [0, 61] */ -+ int tm_min; /* Minutes after the hour -- [0, 59] */ -+ int tm_hour; /* Hours after midnight -- [0, 23] */ -+ int tm_mday; /* Day of the month -- [1, 31] */ -+ int tm_mon; /* Months since January -- [0, 11] */ -+ int tm_year; /* Years since 1900 */ -+ int tm_wday; /* Days since Sunday -- [0, 6] */ -+ int tm_yday; /* Days since January 1 -- [0, 365] */ -+ int tm_isdst; /* Daylight Savings Time flag */ -+}; -+#ifdef powerc -+#pragma options align=reset -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import on -+#endif -+ -+/* -+ * Time manipulation functions -+ */ -+ -+clock_t clock(void); /* function */ -+#if !defined (__powerc) && !defined (powerc) && !defined (__CFM68K__) -+ #define clock() __tickcount() /* macro - use TickCount() */ -+ pascal unsigned long __tickcount(void) -+ = 0xA975; -+#endif /* powerc */ -+ -+double difftime(time_t time1, time_t time0); /* function */ -+#define difftime(time1,time0) ((long double)time1 - time0) /* macro */ -+ -+time_t mktime(struct tm *timeptr); -+time_t time(time_t *timer); -+ -+ -+/* -+ * Time conversion functions -+ */ -+ -+char *asctime (const struct tm *timeptr); -+char *ctime(const time_t *timer); -+struct tm *gmtime(const time_t *timer); -+struct tm *localtime(const time_t *timer); -+size_t strftime(char *s, size_t maxsize, -+ const char *format, const struct tm *timerptr); -+ -+#if defined (__powerc) || defined (powerc) || defined (__CFM68K__) -+ #pragma import off -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff --git a/Interfaces/CIncludes/time.h.idump b/Interfaces/CIncludes/time.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/time.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/time.h.rdump b/Interfaces/CIncludes/time.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/time.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0000 0018 066D 4FA0" /* ..Monaco.....mO. */ -+ $"0019 0000 0172 7FFF 010B 0009 000A 7FFF" /* .....r.......... */ -+ $"0116 0006 0004 002A 0007 0156 01DD 002A" /* .......*...V...* */ -+ $"0007 0156 01DD AF05 7A6D 0000 0000 0000" /* ...V....zm...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 0156 01DD 002A 0007 0156 01DD" /* .*...V...*...V.. */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0344 8000 0000 0533 2E34 2E34 2533 2E34" /* .D.....3.4.4%3.4 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3939 352D" /* uter, Inc. 1995- */ -+ $"3937" /* 97 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/typeinfo.h b/Interfaces/CIncludes/typeinfo.h new file mode 100644 --- /dev/null @@ -415673,57 +414127,6 @@ new file mode 100644 + $"632E 2031 3939 372D 3230 3032" /* c. 1997-2002 */ +}; + -diff --git a/Interfaces/CIncludes/values.h b/Interfaces/CIncludes/values.h -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/values.h -@@ -0,0 +1,9 @@ -+/* -+ File: Values.h -+ -+ Copyright: © 1984-1994 by Apple Computer, Inc. -+ All rights reserved. -+ -+*/ -+ -+#error " is now obsolete. Use or . Please read the Release Notes." -diff --git a/Interfaces/CIncludes/values.h.idump b/Interfaces/CIncludes/values.h.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/values.h.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/CIncludes/values.h.rdump b/Interfaces/CIncludes/values.h.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/CIncludes/values.h.rdump -@@ -0,0 +1,25 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0080 0017 0162 13C0" /* ..Monaco.....b.. */ -+ $"0162 1630 0000 0000 0096 78D0 0159 6BE8" /* .b.0......x..Yk. */ -+ $"000A 0006 0004 002A 0007 013A 027D 002A" /* .......*...:.}.* */ -+ $"0007 013A 027D AB15 BB40 0000 0000 0000" /* ...:.}...@...... */ -+ $"0000 0000 0000 0100" /* ........ */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 0007 013A 027D 002A 0007 013A 027D" /* .*...:.}.*...:.} */ -+ $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ -+}; -+ -+data 'vers' (1) { -+ $"0334 8000 0000 0533 2E33 2E34 2533 2E33" /* .4.....3.3.4%3.3 */ -+ $"2E34 2C20 A920 4170 706C 6520 436F 6D70" /* .4, . Apple Comp */ -+ $"7574 6572 2C20 496E 632E 2031 3938 352D" /* uter, Inc. 1985- */ -+ $"3934" /* 94 */ -+}; -+ -+data 'vers' (2, purgeable) { -+ $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ -+ $"2023 3233" /* #23 */ -+}; -+ diff --git a/Interfaces/CIncludes/vectorOps.h b/Interfaces/CIncludes/vectorOps.h new file mode 100644 --- /dev/null @@ -566077,15 +564480,15 @@ diff --git a/Interfaces/PInterfaces/Dictionary.p.rdump b/Interfaces/PInterfaces/ }; diff --git a/Interfaces/PInterfaces/DisAsmLookUp.p b/Interfaces/PInterfaces/DisAsmLookUp.p -deleted file mode 100644 --- a/Interfaces/PInterfaces/DisAsmLookUp.p -+++ /dev/null -@@ -1,489 +0,0 @@ --{ ++++ b/Interfaces/PInterfaces/DisAsmLookUp.p +@@ -1,19 +1,17 @@ + { - Created: Wednesday, November 1, 1989 - DisAsmLookup.p - Pascal Interface to the Macintosh Libraries -- ++ File: DisAsmLookup.p + - Copyright Apple Computer, Inc. 1987-1991 - All rights reserved - This file is used in these builds: ROM System @@ -566097,35 +564500,43 @@ deleted file mode 100644 - <2> 3/13/91 JL Checked in MPW version. - - To Do: --} -- --{$IFC UNDEFINED UsingIncludes} --{$SETC UsingIncludes := 0} --{$ENDC} -- --{$IFC NOT UsingIncludes} -- UNIT DisAsmLookup; -- INTERFACE --{$ENDC} -- ++ Copyright: © 1984-1994 by Apple Computer, Inc. ++ All rights reserved. ++ ++ Version: Universal Interfaces 2.0a1 ETO #15, MPW prerelease. July 22, 1994 ++ ++ Bugs?: If you find a problem with this file, send the file and version ++ information (from above) and the problem description to: ++ ++ Internet: apple.bugs@applelink.apple.com ++ AppleLink: APPLE.BUGS ++ + } + + {$IFC UNDEFINED UsingIncludes} +@@ -25,14 +23,14 @@ + INTERFACE + {$ENDC} + -{$IFC UNDEFINED UsingDisAsmLookup} -{$SETC UsingDisAsmLookup := 1} -- --{$I+} --{$SETC DisAsmLookupIncludes := UsingIncludes} --{$SETC UsingIncludes := 1} ++{$IFC UNDEFINED __USINGDISASMLOOKUP__} ++{$SETC __USINGDISASMLOOKUP__ := 1} + + {$I+} + {$SETC DisAsmLookupIncludes := UsingIncludes} + {$SETC UsingIncludes := 1} -{$IFC UNDEFINED UsingTypes} -{$I $$Shell(PInterfaces)Types.p} --{$ENDC} --{$SETC UsingIncludes := DisAsmLookupIncludes} -- -- --TYPE -- LookupRegs = (_A0_, _A1_, _A2_, _A3_, _A4_, _A5_, _A6_, _A7_, -- _PC_, _ABS_, _TRAP_, _IMM_); -- --(*----------------------------------------------------------------------*) -- ++{$IFC UNDEFINED __TYPES__} ++{$I Types.p} + {$ENDC} + {$SETC UsingIncludes := DisAsmLookupIncludes} + +@@ -43,13 +41,13 @@ TYPE + + (*----------------------------------------------------------------------*) + -PROCEDURE Disassembler( DstAdjust: LongInt; {addr correction} - VAR BytesUsed: Integer; {bytes used up } - FirstByte: UNIV Ptr; {starting byte } @@ -566133,451 +564544,123 @@ deleted file mode 100644 - VAR Operand: UNIV Str255; {operand } - VAR Comment: UNIV Str255; {comment } - LookupProc: UNIV Ptr); {search proc } -- (* -- Disassembler is a Pascal routine to be called to disassemble a sequence -- of bytes. All MC68xxx, MC68881, and MC68851 instructions are supported. -- The sequence of bytes to be disassembled are pointed to by FirstByte. -- BytesUsed bytes starting at FirstByte are consumed by the disassembly, -- and the Opcode, Operand, and Comment strings returned as NULL TERMINATED -- Pascal strings (for easier manipulation with C). The caller is then free -- to format or use the output strings any way appropriate to the -- application. -- -- Depending on the opcode and effective address(s) (EA's) to be -- disassembled, the Opcode, Operand, and Comment strings contain the -- following information: -- -- Case Opcode Operand Comment -- ======================================================================= -- Non PC-relative EA's op.sz EA's ; 'c…' (for immediates) -- PC-relative EA's op.sz EA's ; address -- Toolbox traps DC.W $AXXX ; TB XXXX -- OS traps DC.W $AXXX ; OS XXXX -- Invalid bytes DC.W $XXXX ; ???? -- ======================================================================= -- -- For valid disassembly of processor instructions the appropriate MC68XXX -- opcode mnemonic is generated for the Opcode string along with a size -- attribute when required. The source and destination EA's are generated -- as the Operand along with a possible comment. Comments start with a ';'. -- Traps use a DC.W assembler directive as the Opcode with the trap word -- as the Operand and a comment indicating whether the trap is a toolbox or -- OS trap and what the trap number is. As described later the caller can -- generate symbolic substitutions into EA's and provide names for traps. -- -- Invalid instructions cause the string 'DC.W' to be returned in the -- Opcode string. Operand is '$XXXX' (the invalid word) with a comment of -- '; ????'. BytesUsed is 2. This is similar to the trap call case except -- for the comment. -- -- Note, the Operand EA's is syntatically similar to but NOT COMPATIBLE -- with the MPW assembler! This is because the Disassembler generates -- byte hex constants as "$XX" and word hex constants as "$XXXX". Negative -- values (e.g., $FF or $FFFF) produced by the Disassembler are treated as -- long word values by the MPW assembler. Thus it is assumed that -- Disassembler output will NOT be used as MPW assembler input. If that is -- the goal, then the caller must convert strings of the form $XX or $XXXX -- in the Operand string to their decimal equivalent. The routine -- ModifyOperand is provided in this unit to aid with the conversion -- process. -- -- Since a PC-relative comment is an address, the only address that the -- Disassembler knows about is the address of the code pointed to by -- FirstByte. Generally, that may be a buffer that has no relation to -- "reality", i.e., the actual code loaded into the buffer. Therefore, -- to allow the address comment to be mapped back to some actual address -- the caller may specify an adjustment factor, specified by DstAdjust, -- that is ADDED to the value that normally would be placed in the -- comment. -- -- Operand effective address strings are generated as a function of the -- effective address mode and a special case is made for A-trap opcode -- strings. In places where a possible symbolic reference could be -- substituted for an address (or a portion of an address), the Disassembler -- can call a user specified routine to do the substitution (using the -- LookupProc parameter described later). The following table summarizes -- the generated effective addresses and where symbolic substitutions (S) -- can be made: -- -- Mode Generated Effective Address Effective Address with Substitution -- ======================================================================== -- 0 Dn Dn -- 1 An An -- 2 (An) (An) -- 3 (An)+ (An)+ -- 4 -(An) -(An) -- 5 ∂(An) S(An) or just S (if An=A5, ∂≥0) -- 6n ∂(An,Xn.Size*Scale) S(An,Xn.Size*Scale) -- 6n (BD,An,Xn.Size*Scale) (S,An,Xn.Size*Scale) -- 6n ([BD,An],Xm.Size*Scale,OD) ([S,An],Xm.Size*Scale,OD) -- 6n ([BD,An,Xn.Size*Scale],OD) ([S,An,Xn.Size*Scale],OD) -- 70 ∂ S -- 71 ∂ S -- 72 *±∂ S -- 73 *±∂(Xn.Size*Scale) S(Xn.Size*Scale) -- 73 (*±∂,Xn.Size*Scale) (S,Xn.Size*Scale) -- 73 ([*±∂],Xm.Size*Scale,OD) ([S],Xm.Size*Scale,OD) -- 73 ([*±∂,Xn.Size*Scale],OD) ([S,Xn.Size*Scale],OD) -- 74 #data S (#data made comment) -- A-traps $AXXX S (as opcode, AXXX made comment) -- ======================================================================== -- -- For A-traps, the substitution can be performed to substitute for the DC.W -- opcode string. If the substitution is made then the Disassembler will -- generate ,Sys and/or ,Immed flags as operands for Toolbox traps and -- ,AutoPop for OS traps when the bits in the trap word indicates these -- settings. -- -- | Generated | Substituted -- | Opcode Operand Comment | Opcode Operand Comment -- ======================================================================== -- Toolbox | DC.W $AXXX ; TB XXXX | S [,Sys][,Immed] ; AXXX -- OS | DC.W $AXXX ; OS XXXX | S [,AutoPop] ; AXXX -- ======================================================================== -- -- All displacements (∂, BD, OD) are hexadecimal values shown as a byte -- ($XX), word ($XXXX), or long ($XXXXXXXX) as appropriate. The *Scale is -- suppressed if 1. The Size is W or L. Note that effective address -- substitutions can only be made for "∂(An)", "BD,An", and "*±∂" cases. -- -- For all the effective address modes 5, 6n, 7n, and for A-traps, a -- coroutine (a procedure) whose address is specified by the LookupProc -- parameter is called by the Disassembler (if LookupProc is not NIL) to -- do the substitution (or A-trap comment) with a string returned by the -- proc. It is assumed that the proc pointed to by LookupProc is a level 1 -- Pascal proc declared as follows: -- ++PROCEDURE Disassembler( DstAdjust: LongInt; {addr correction} ++ VAR BytesUsed: Integer; {bytes used up } ++ FirstByte: UNIV Ptr; {starting byte } ++ VAR Opcode: UNIV Str255; {mnemonic } ++ VAR Operand: UNIV Str255; {operand } ++ VAR Comment: UNIV Str255; {comment } ++ LookupProc: UNIV Ptr); {search proc } + (* + Disassembler is a Pascal routine to be called to disassemble a sequence + of bytes. All MC68xxx, MC68881, and MC68851 instructions are supported. +@@ -164,17 +162,17 @@ PROCEDURE Disassembler( DstAdjust: LongInt; {addr correction} + proc. It is assumed that the proc pointed to by LookupProc is a level 1 + Pascal proc declared as follows: + - PROCEDURE Lookup( PC: UNIV Ptr; {Addr of extension/trap word} - BaseReg: LookupRegs; {Base register/lookup mode } - Opnd: UNIV LongInt; {Trap word, PC addr, disp. } - VAR S: Str255); {Returned substitution } -- -- or in C, -- -- pascal void LookUp(Ptr PC, /* Addr of extension/trap word */ ++ PROCEDURE Lookup( PC: UNIV Ptr; {Addr of extension/trap word} ++ BaseReg: LookupRegs; {Base register/lookup mode } ++ Opnd: UNIV LongInt; {Trap word, PC addr, disp. } ++ VAR S: Str255); {Returned substitution } + + or in C, + + pascal void LookUp(Ptr PC, /* Addr of extension/trap word */ - LookupRegs BaseReg, /* Base register/lookup mode */ - long Opnd, /* Trap word, PC addr, disp. */ - char *S); /* Returned substitution */ -- -- PC = Pointer to instruction extension word or A-trap word in the -- buffer pointed to by the Disassembler's FirstByte parameter. -- -- BaseReg = This determines the meaning of the Opnd value and supplies -- the base register for the "∂(An)", "BD,An", and "*±∂" cases. -- BaseReg may contain any one of the following values: -- -- _A0_ = 0 ==> A0 -- _A1_ = 1 ==> A1 -- _A2_ = 2 ==> A2 -- _A3_ = 3 ==> A3 -- _A4_ = 4 ==> A4 -- _A5_ = 5 ==> A5 -- _A6_ = 6 ==> A6 -- _A7_ = 7 ==> A7 -- _PC_ = 8 ==> PC-relative (special case) -- _ABS_ = 9 ==> Abs addr (special case) -- _TRAP_ = 10 ==> Trap word (special case) -- _IMM_ = 11 ==> Immediate (special case) -- -- For absolute addressing (modes 70 and 71), BaseReg contains -- _ABS_. For A-traps, BaseReg would contain _TRAP_. For -- immediate data (mode 74), BaseReg would contain _IMM_. -- -- Opnd = The contents of this LongInt is determined by the BaseReg -- parameter just described. -- -- For BaseReg = _IMM_ (immediate data): -- Opnd contains the (extended) 32-bit immediate data specified -- by the instruction. -- -- For BaseReg = _TRAP_ (A-traps): -- Opnd is the entire trap word. The high order 16 bits of -- Opnd are zero. -- -- For BaseReg = _ABS_ (absolute effective address): -- Opnd contains the (extended) 32-bit address specifed by -- the instruction's effective address. Such addresses would -- generally be used to reference low memory globals on a -- Macintosh. -- -- For BaseReg = _PC_ (PC-relative effective address): -- Opnd contains the 32-bit address represented by "*±∂" -- adjusted by the Disassembler's DstAdjust parameter. -- -- For BaseReg = _An_ (effective address with a base register): -- Opnd contains the (sign-extended) 32-bit (base) -- displacement from the instruction's effective address. -- -- In the Macintosh environment, a BaseReg specifying A5 -- implies either global data references or Jump Table -- references. Positive Opnd values with an A5 BaseReg thus -- mean Jump Table references, while a negative offset would -- mean a global data reference. Base registers of A6 or A7 -- would usually mean local data. -- -- S = Pascal string returned from Lookup containing the effective -- address substitution string or a trap name for A-traps. S is -- set to null PRIOR to calling Lookup. If it is still null on -- return, the string is not used. If not null, then for A-traps, -- the returned string is used as the opcode string. In all other -- cases the string is substituted as shown in the above table. -- -- Depending on the application, the caller has three choices on how to -- use the Disassembler and an associated Lookup proc: -- -- (1). The caller can call just the Disassembler and provide his own Lookup -- proc. In that case the calling conventions discussed above must be -- followed. -- -- (2). The caller can provide NIL for the LookupProc parameter, in which -- case, NO Lookup proc will be called. -- -- (3). The caller can call first InitLookup (described below, a proc -- provided with this unit) and pass the address of this unit's -- standard Lookup proc when Disassembler is called. In this case all -- the control logic to determine the kind of substitution to be done -- is provided for the caller and all that need to be provided by the -- user are routines to look up any or all of the following: -- -- • PC-relative references -- • Jump Table references -- • Absolute address references -- • Trap names -- • Immediate data names -- • References with offsets from base registers *) -- -- --PROCEDURE InitLookup(PCRelProc, JTOffProc, TrapProc, AbsAddrProc, IdProc, ImmDataProc: UNIV Ptr); -- {Prepare for use of this unit's Lookup proc. When Disassembler is called -- and the address of this unit's Lookup proc is specified, then for immediate -- data, PC-relative, Jump Table references, A-traps, absolute addresses, and -- offsets from a base register, the associated level 1 Pascal proc -- specified here is called (if not NIL -- all six addresses are preset to -- NIL). The calls assume the following declarations for these procs (see -- Lookup, below for further details): -- -- PROCEDURE PCRelProc(Address: UNIV LongInt; ++ LookupRegs BaseReg, /* Base register/lookup mode */ ++ long Opnd, /* Trap word, PC addr, disp. */ ++ char *S); /* Returned substitution */ + + PC = Pointer to instruction extension word or A-trap word in the + buffer pointed to by the Disassembler's FirstByte parameter. +@@ -274,33 +272,33 @@ PROCEDURE InitLookup(PCRelProc, JTOffProc, TrapProc, AbsAddrProc, IdProc, ImmDat + Lookup, below for further details): + + PROCEDURE PCRelProc(Address: UNIV LongInt; - VAR S: UNIV Str255); -- -- PROCEDURE JTOffProc(A5JTOffset: UNIV Integer; ++ VAR S: UNIV Str255); + + PROCEDURE JTOffProc(A5JTOffset: UNIV Integer; - VAR S: UNIV Str255); -- -- PROCEDURE TrapNameProc(TrapWord: UNIV Integer; ++ VAR S: UNIV Str255); + + PROCEDURE TrapNameProc(TrapWord: UNIV Integer; - VAR S: UNIV Str255); -- -- PROCEDURE AbsAddrProc(AbsAddr: UNIV LongInt; ++ VAR S: UNIV Str255); + + PROCEDURE AbsAddrProc(AbsAddr: UNIV LongInt; - VAR S: UNIV Str255); -- -- PROCEDURE IdProc(BaseReg: LookupRegs; ++ VAR S: UNIV Str255); + + PROCEDURE IdProc(BaseReg: LookupRegs; - Offset: UNIV LongInt; - VAR S: UNIV Str255); -- -- PROCEDURE ImmDataProc(ImmData: UNIV LongInt; ++ Offset: UNIV LongInt; ++ VAR S: UNIV Str255); + + PROCEDURE ImmDataProc(ImmData: UNIV LongInt; - VAR S: UNIV Str255); -- -- Note: InitLookup contains initialized data which requires initializing -- at load time (this is of concern only to users with assembler -- main programs.} -- -- ++ VAR S: UNIV Str255); + + Note: InitLookup contains initialized data which requires initializing + at load time (this is of concern only to users with assembler + main programs.} + + - PROCEDURE Lookup( PC: UNIV Ptr; {Addr of extension/trap word} - BaseReg: LookupRegs; {Base register/lookup mode } - Opnd: UNIV LongInt; {Trap word, PC addr, disp. } - VAR S: Str255); {Returned substitution } -- {This is a standard Lookup proc available to the caller for calls to the -- Disassembler. If the caller elects to use this proc, then InitLookup -- MUST be called prior to any calls to the Disassembler. All the logic -- to determine the type of lookup is done by this proc. For PC-relative, -- Jump Table references, A-traps, absolute addresses, and offsets from a -- base register, the associated level 1 Pascal proc specified in the -- InitLookup call (if not NIL) is called. -- -- This scheme simplifies the Lookup mechanism by allowing the caller -- to deal with just the problems related to the application.} -- -- ++ PROCEDURE Lookup( PC: UNIV Ptr; {Addr of extension/trap word} ++ BaseReg: LookupRegs; {Base register/lookup mode } ++ Opnd: UNIV LongInt; {Trap word, PC addr, disp. } ++ VAR S: Str255); {Returned substitution } + {This is a standard Lookup proc available to the caller for calls to the + Disassembler. If the caller elects to use this proc, then InitLookup + MUST be called prior to any calls to the Disassembler. All the logic +@@ -313,8 +311,8 @@ PROCEDURE InitLookup(PCRelProc, JTOffProc, TrapProc, AbsAddrProc, IdProc, ImmDat + to deal with just the problems related to the application.} + + -PROCEDURE LookupTrapName(TrapWord: UNIV Integer; - VAR S: UNIV Str255); -- {This is a procedure provided to allow conversion of a trap instruction -- (in TrapWord) to its corresponding trap name (in S). It is provided -- primarily for use with the Disassembler and its address may be passed to -- InitLookup above for use by this unit's Lookup routine. Alternatively, -- there is nothing prohibiting the caller from using it directly for other -- purposes or by some other Lookup proc. -- -- Note: The tables in this proc make the size of this proc about 9500 -- bytes. The trap names are fully spelled out in upper and lower -- case.} -- --PROCEDURE ModifyOperand(VAR Operand: UNIV Str255); -- {Scan an operand string, i.e., the null terminated Pascal string returned -- by the Disassembler (null MUST be present here) and modify negative hex -- values to negated positive value. For example, $FFFF(A5) would be -- modified to -$0001(A5). The operand to be processed is passed as the -- function's parameter which is edited "in place" and returned to the -- caller. -- -- This routine is essentially a pattern matcher and attempts to only -- modify 2, 4, and 8 digit hex strings in the operand that "might" be -- offsets from a base register. If the matching tests are passed, the -- same number of original digits are output (because that indicates a -- value's size -- byte, word, or long). -- -- For a hex string to be modified, the following tests must be passed: -- -- • There must have been exactly 2, 4, or 8 digits. -- -- Only hex strings $XX, $XXXX, and $XXXXXXXX are possible candidates -- because that is the only way the Disassembler generates offsets. -- -- • Hex string must be delimited by a "(" or a ",". -- -- The "(" allows offsets for $XXXX(An,...) and $XX(An,Xn) addressing -- modes. The comma allows for the MC68020 addressing forms. -- -- • The "$X..." must NOT be preceded by a "±". -- -- This eliminates the possibility of modifying the offset of a -- PC-relative addressing mode always generated in the form "*±$XXXX". -- -- • The "$X..." must NOT be preceded by a "#". -- -- This eliminates modifying immediate data. -- -- • Value must be negative. -- -- Negative values are the only values we modify. A value $FFFF is -- modified to -$0001.} -- --FUNCTION validMacsBugSymbol(symStart, limit: UNIV Ptr; ++PROCEDURE LookupTrapName(TrapWord: UNIV Integer; ++ VAR S: UNIV Str255); + {This is a procedure provided to allow conversion of a trap instruction + (in TrapWord) to its corresponding trap name (in S). It is provided + primarily for use with the Disassembler and its address may be passed to +@@ -367,7 +365,7 @@ PROCEDURE ModifyOperand(VAR Operand: UNIV Str255); + modified to -$0001.} + + FUNCTION validMacsBugSymbol(symStart, limit: UNIV Ptr; - symbol: StringPtr): StringPtr; C; -- {Check that the bytes pointed to by symStart represents a valid MacsBug -- symbol. The symbol must be fully contained in the bytes starting at -- symStart, up to, but not including, the byte pointed to by the limit -- parameter. -- -- If a valid symbol is NOT found, then NIL is returned as the function's -- result. However, if a valid symbol is found, it is copied to symbol (if -- it is not NIL) as a null terminated Pascal string, and return a pointer -- to where we think the FOLLOWING module begins. In the "old style" cases -- (see below) this will always be 8 or 16 bytes after the input symStart. -- For new style Apple Pascal and C cases this will depend on the symbol -- length, existence of a pad byte, and size of the constant (literal) area. -- In all cases, trailing blanks are removed from the symbol. -- -- A valid MacsBug symbol consists of the characters '_', '%', spaces, -- digits, and upper/lower case letters in a format determined by the first -- two bytes of the symbol as follows: -- -- 1st byte | 2nd byte | Byte | -- Range | Range | Length | Comments -- ======================================================================= -- $20 - $7F | $20 - $7F | 8 | "Old style" MacsBug symbol format -- $A0 - $7F | $20 - $7F | 8 | "Old style" MacsBug symbol format -- ----------------------------------------------------------------------- -- $20 - $7F | $80 - $FF | 16 | "Old style" MacApp symbol ab==>b.a -- $A0 - $7F | $80 - $FF | 16 | "Old style" MacApp symbol ab==>b.a -- ----------------------------------------------------------------------- -- $80 | $01 - $FF | n | n = 2nd byte (Apple symbol) -- $81 - $9F | $00 - $FF | m | m = BAnd(1st byte,$7F) (Apple symbol) -- ======================================================================= -- -- The formats are determined by whether bit 7 is set in the first and -- second bytes. This bit will removed when we find it or'ed into the first -- and/or second valid symbol characters. -- -- The first two formats in the above table are the basic "old style" (pre- -- existing) MacsBug formats. The first byte may or may not have bit 7 set -- the second byte is a valid symbol character. The first byte (with bit 7 -- removed) and the next 7 bytes are assumed to comprise the symbol. -- -- The second pair of formats are also "old style" formats, but used for -- MacApp symbols. Bit 7 set in the second character indicates these -- formats. The symbol is assumed to be 16 bytes with the second 8 bytes -- preceding the first 8 bytes in the generated symbol. For example, -- 12345678abcdefgh represents the symbol abcdefgh.12345678. -- -- The last pair of formats are reserved by Apple and generated by the MPW -- Pascal and C compilers. In these cases the value of the first byte is -- always between $80 and $9F, or with bit 7 removed, between $00 and $1F. -- For $00, the second byte is the length of the symbol with that many bytes -- following the second byte (thus a max length of 255). Values $01 to $1F -- represent the length itself. A pad byte may follow these variable length -- cases if the symbol does not end on a word boundary. Following the -- symbol and the possible pad byte is a word containing the size of the -- constants (literals) generated by the compiler. -- -- Note that if symStart actually does point to a valid MacsBug symbol, -- then you may use showMacsBugSymbol to convert the MacsBug symbol bytes to -- a string that could be used as a DC.B operand for disassembly purposes. -- This string explicitly shows the MacsBug symbol encodings.} -- --FUNCTION endOfModule(address, limit: UNIV Ptr; symbol: StringPtr; -- VAR nextModule: UNIV Ptr): StringPtr; C; -- {Check to see if the specified memory address, contains a RTS, JMP (A0) or -- RTD #n instruction immediately followed by a valid MacsBug symbol. These -- sequences are the only ones which can determine an end of module when -- MacsBug symbols are present. During the check, the instruction and its -- following MacsBug symbol must be fully contained in the bytes starting at -- the specified address parameter, up to, but not including, the byte -- pointed to by the limit parameter. -- -- If the end of module is NOT found, then NIL is returned as the -- function's result. However, if a end of module is found, the MacsBug -- symbol is returned in symbol (if it is not NIL) as a null terminated -- Pascal string (with trailing blanks removed), and the functions returns -- the pointer to the start of the MacsBug symbol (i.e., address+2 for RTS -- or JMP (A0) and address+4 for RTD #n). This address may then be used as -- in input parameter to showMacsBugSymbol to convert the MacsBug symbol to -- a Disassembler operand string. -- -- Also returned in nextModule is where we think the FOLLOWING module -- begins. In the "old style" cases (see validMacsBugSymbol) this will -- always be 8 or 16 bytes after the input address. For new style the -- Apple Pascal and C cases this will depend on the symbol length, existence -- of a pad byte, and size of the constant (literal) area. See -- validMacsBugSymbol for a description of valid MacsBug symbol formats.} -- --FUNCTION showMacsBugSymbol(symStart, limit: UNIV Ptr; operand: StringPtr; -- VAR bytesUsed: Integer): StringPtr; C; -- {Format a MacsBug symbol as a operand of a DC.B directive. The first one -- or two bytes of the symbol are generated as $80+'c' if they have there -- high high bits set. All other characters are shown as characters in a -- string constant. The pad byte, if present, is one is also shown as $00. -- -- When called, showMacsBugSymbol assumes that symStart is pointing at a -- valid MacsBug symbol as validated by the validMacsBugSymbol or -- endOfModule routines. As with validMacsBugSymbol, the symbol must be -- fully contained in the bytes starting at symStart up to, but not -- including, the byte pointed to by the limit parameter. -- -- The string is returned in the 'operand' parameter as a null terminated -- Pascal string. The function also returns a pointer to this string as its -- return value (NIL is returned only if the byte pointed to by the limit -- parameter is reached prior to processing the entire symbol -- which -- should not happen if properly validated). The number of bytes used for -- the symbol is returned in bytesUsed. Due to the way MacsBug symbols are -- encoded, bytesUsed may not necessarily be the same as the length of the -- operand string. -- -- A valid MacsBug symbol consists of the characters '_', '%', spaces, -- digits, and upper/lower case letters in a format determined by the first -- two bytes of the symbol as described in the validMacsBugSymbol routine.} -- ++ symbol: StringPtr): StringPtr; C; + {Check that the bytes pointed to by symStart represents a valid MacsBug + symbol. The symbol must be fully contained in the bytes starting at + symStart, up to, but not including, the byte pointed to by the limit +@@ -481,7 +479,7 @@ FUNCTION showMacsBugSymbol(symStart, limit: UNIV Ptr; operand: StringPtr; + digits, and upper/lower case letters in a format determined by the first + two bytes of the symbol as described in the validMacsBugSymbol routine.} + -{$ENDC} { UsingDisAsmLookup } -- --{$IFC NOT UsingIncludes} -- END. --{$ENDC} -- ++{$ENDC} { __USINGDISASMLOOKUP__ } + + {$IFC NOT UsingIncludes} + END. diff --git a/Interfaces/PInterfaces/DisAsmLookUp.p.rdump b/Interfaces/PInterfaces/DisAsmLookUp.p.rdump -deleted file mode 100644 --- a/Interfaces/PInterfaces/DisAsmLookUp.p.rdump -+++ /dev/null -@@ -1,53 +0,0 @@ --data 'MPSR' (1005) { ++++ b/Interfaces/PInterfaces/DisAsmLookUp.p.rdump +@@ -1,53 +1,430 @@ + data 'MPSR' (1005) { - $"0009 4D6F 6E61 636F 0000 0000 0000 0000" /* ..Monaco........ */ -- $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ ++ $"0009 4D6F 6E61 636F 0000 0000 029D A670" /* ..Monaco.......p */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0006 0002 002A 0003 0142 01E3 002A" /* .......*...B...* */ - $"0003 0142 01E3 A4C6 F947 0000 00D8 0000" /* ...B.....G...... */ - $"00D8 0000 0000 0100" /* ........ */ @@ -566596,555 +564679,23 @@ deleted file mode 100644 - $"6E64 4F66 4D6F 6475 6C65 0000 5512 0000" /* ndOfModule..U... */ - $"5523 1173 686F 774D 6163 7342 7567 5379" /* U#.showMacsBugSy */ - $"6D62 6F6C" /* mbol */ --}; -- --data 'MPSR' (1008) { ++ $"0000 0006 0002 002A 001C 0357 0218 0029" /* .......*...W...) */ ++ $"0003 0198 01FB AA55 F483 0000 5AC6 0000" /* .......U....Z... */ ++ $"5AC6 0000 514D 0100" /* Z...QM.. */ + }; + + data 'MPSR' (1008) { - $"002A 0003 0142 01E3 002A 0003 0142 01E3" /* .*...B...*...B.. */ - $"0000 0000 0000 0000 0000 0000 0000" /* .............. */ --}; -- ++ $"002A 001C 0357 0218 0029 0003 0198 01FB" /* .*...W...)...... */ ++ $"0000 514D 0000 0000 0000 0000 0000" /* ..QM.......... */ + }; + -data 'vers' (1, purgeable) { - $"0320 8000 0000 0533 2E32 2E30 2433 2E32" /* . .....3.2.0$3.2 */ - $"2E30 20A9 2041 7070 6C65 2043 6F6D 7075" /* .0 . Apple Compu */ - $"7465 722C 2049 6E63 2E20 3139 3835 2D39" /* ter, Inc. 1985-9 */ - $"31" /* 1 */ --}; -- --data 'vers' (2, purgeable) { -- $"0320 6006 0000 0533 2E32 6236 094D 5057" /* . `....3.2b6.MPW */ -- $"2033 2E32 6236" /* 3.2b6 */ --}; -- --data 'ckid' (128, "Projector") { -- $"2368 E847 3FE5 3230 0004 0000 0000 0000" /* #h.G?.20........ */ -- $"0000 A933 7527 A933 7527 A5B5 F4B5 0008" /* ...3u'.3u'...... */ -- $"4E86 0000 0014 0001 2653 7570 6572 4D61" /* N.......&SuperMa */ -- $"7269 6F50 726F 6ABA 496E 7465 7266 6163" /* rioProj.Interfac */ -- $"6573 BA50 496E 7465 7266 6163 6573 BA00" /* es.PInterfaces.. */ -- $"0E43 6872 6973 2050 6574 6572 7365 6E00" /* .Chris Petersen. */ -- $"0131 000E 4469 7341 736D 4C6F 6F6B 5570" /* .1..DisAsmLookUp */ -- $"2E70 0000 0000 2846 6972 7374 2043 6865" /* .p....(First Che */ -- $"636B 496E 2028 5265 7669 7369 6F6E 2033" /* ckIn (Revision 3 */ -- $"2066 726F 6D20 5265 616C 6974 7929 2E00" /* from Reality).. */ --}; -- -diff --git a/Interfaces/PInterfaces/DisAsmLookup.p b/Interfaces/PInterfaces/DisAsmLookup.p -new file mode 100644 ---- /dev/null -+++ b/Interfaces/PInterfaces/DisAsmLookup.p -@@ -0,0 +1,487 @@ -+{ -+ File: DisAsmLookup.p -+ -+ Copyright: © 1984-1994 by Apple Computer, Inc. -+ All rights reserved. -+ -+ Version: Universal Interfaces 2.0a1 ETO #15, MPW prerelease. July 22, 1994 -+ -+ Bugs?: If you find a problem with this file, send the file and version -+ information (from above) and the problem description to: -+ -+ Internet: apple.bugs@applelink.apple.com -+ AppleLink: APPLE.BUGS -+ -+} -+ -+{$IFC UNDEFINED UsingIncludes} -+{$SETC UsingIncludes := 0} -+{$ENDC} -+ -+{$IFC NOT UsingIncludes} -+ UNIT DisAsmLookup; -+ INTERFACE -+{$ENDC} -+ -+{$IFC UNDEFINED __USINGDISASMLOOKUP__} -+{$SETC __USINGDISASMLOOKUP__ := 1} -+ -+{$I+} -+{$SETC DisAsmLookupIncludes := UsingIncludes} -+{$SETC UsingIncludes := 1} -+{$IFC UNDEFINED __TYPES__} -+{$I Types.p} -+{$ENDC} -+{$SETC UsingIncludes := DisAsmLookupIncludes} -+ -+ -+TYPE -+ LookupRegs = (_A0_, _A1_, _A2_, _A3_, _A4_, _A5_, _A6_, _A7_, -+ _PC_, _ABS_, _TRAP_, _IMM_); -+ -+(*----------------------------------------------------------------------*) -+ -+PROCEDURE Disassembler( DstAdjust: LongInt; {addr correction} -+ VAR BytesUsed: Integer; {bytes used up } -+ FirstByte: UNIV Ptr; {starting byte } -+ VAR Opcode: UNIV Str255; {mnemonic } -+ VAR Operand: UNIV Str255; {operand } -+ VAR Comment: UNIV Str255; {comment } -+ LookupProc: UNIV Ptr); {search proc } -+ (* -+ Disassembler is a Pascal routine to be called to disassemble a sequence -+ of bytes. All MC68xxx, MC68881, and MC68851 instructions are supported. -+ The sequence of bytes to be disassembled are pointed to by FirstByte. -+ BytesUsed bytes starting at FirstByte are consumed by the disassembly, -+ and the Opcode, Operand, and Comment strings returned as NULL TERMINATED -+ Pascal strings (for easier manipulation with C). The caller is then free -+ to format or use the output strings any way appropriate to the -+ application. -+ -+ Depending on the opcode and effective address(s) (EA's) to be -+ disassembled, the Opcode, Operand, and Comment strings contain the -+ following information: -+ -+ Case Opcode Operand Comment -+ ======================================================================= -+ Non PC-relative EA's op.sz EA's ; 'c…' (for immediates) -+ PC-relative EA's op.sz EA's ; address -+ Toolbox traps DC.W $AXXX ; TB XXXX -+ OS traps DC.W $AXXX ; OS XXXX -+ Invalid bytes DC.W $XXXX ; ???? -+ ======================================================================= -+ -+ For valid disassembly of processor instructions the appropriate MC68XXX -+ opcode mnemonic is generated for the Opcode string along with a size -+ attribute when required. The source and destination EA's are generated -+ as the Operand along with a possible comment. Comments start with a ';'. -+ Traps use a DC.W assembler directive as the Opcode with the trap word -+ as the Operand and a comment indicating whether the trap is a toolbox or -+ OS trap and what the trap number is. As described later the caller can -+ generate symbolic substitutions into EA's and provide names for traps. -+ -+ Invalid instructions cause the string 'DC.W' to be returned in the -+ Opcode string. Operand is '$XXXX' (the invalid word) with a comment of -+ '; ????'. BytesUsed is 2. This is similar to the trap call case except -+ for the comment. -+ -+ Note, the Operand EA's is syntatically similar to but NOT COMPATIBLE -+ with the MPW assembler! This is because the Disassembler generates -+ byte hex constants as "$XX" and word hex constants as "$XXXX". Negative -+ values (e.g., $FF or $FFFF) produced by the Disassembler are treated as -+ long word values by the MPW assembler. Thus it is assumed that -+ Disassembler output will NOT be used as MPW assembler input. If that is -+ the goal, then the caller must convert strings of the form $XX or $XXXX -+ in the Operand string to their decimal equivalent. The routine -+ ModifyOperand is provided in this unit to aid with the conversion -+ process. -+ -+ Since a PC-relative comment is an address, the only address that the -+ Disassembler knows about is the address of the code pointed to by -+ FirstByte. Generally, that may be a buffer that has no relation to -+ "reality", i.e., the actual code loaded into the buffer. Therefore, -+ to allow the address comment to be mapped back to some actual address -+ the caller may specify an adjustment factor, specified by DstAdjust, -+ that is ADDED to the value that normally would be placed in the -+ comment. -+ -+ Operand effective address strings are generated as a function of the -+ effective address mode and a special case is made for A-trap opcode -+ strings. In places where a possible symbolic reference could be -+ substituted for an address (or a portion of an address), the Disassembler -+ can call a user specified routine to do the substitution (using the -+ LookupProc parameter described later). The following table summarizes -+ the generated effective addresses and where symbolic substitutions (S) -+ can be made: -+ -+ Mode Generated Effective Address Effective Address with Substitution -+ ======================================================================== -+ 0 Dn Dn -+ 1 An An -+ 2 (An) (An) -+ 3 (An)+ (An)+ -+ 4 -(An) -(An) -+ 5 ∂(An) S(An) or just S (if An=A5, ∂≥0) -+ 6n ∂(An,Xn.Size*Scale) S(An,Xn.Size*Scale) -+ 6n (BD,An,Xn.Size*Scale) (S,An,Xn.Size*Scale) -+ 6n ([BD,An],Xm.Size*Scale,OD) ([S,An],Xm.Size*Scale,OD) -+ 6n ([BD,An,Xn.Size*Scale],OD) ([S,An,Xn.Size*Scale],OD) -+ 70 ∂ S -+ 71 ∂ S -+ 72 *±∂ S -+ 73 *±∂(Xn.Size*Scale) S(Xn.Size*Scale) -+ 73 (*±∂,Xn.Size*Scale) (S,Xn.Size*Scale) -+ 73 ([*±∂],Xm.Size*Scale,OD) ([S],Xm.Size*Scale,OD) -+ 73 ([*±∂,Xn.Size*Scale],OD) ([S,Xn.Size*Scale],OD) -+ 74 #data S (#data made comment) -+ A-traps $AXXX S (as opcode, AXXX made comment) -+ ======================================================================== -+ -+ For A-traps, the substitution can be performed to substitute for the DC.W -+ opcode string. If the substitution is made then the Disassembler will -+ generate ,Sys and/or ,Immed flags as operands for Toolbox traps and -+ ,AutoPop for OS traps when the bits in the trap word indicates these -+ settings. -+ -+ | Generated | Substituted -+ | Opcode Operand Comment | Opcode Operand Comment -+ ======================================================================== -+ Toolbox | DC.W $AXXX ; TB XXXX | S [,Sys][,Immed] ; AXXX -+ OS | DC.W $AXXX ; OS XXXX | S [,AutoPop] ; AXXX -+ ======================================================================== -+ -+ All displacements (∂, BD, OD) are hexadecimal values shown as a byte -+ ($XX), word ($XXXX), or long ($XXXXXXXX) as appropriate. The *Scale is -+ suppressed if 1. The Size is W or L. Note that effective address -+ substitutions can only be made for "∂(An)", "BD,An", and "*±∂" cases. -+ -+ For all the effective address modes 5, 6n, 7n, and for A-traps, a -+ coroutine (a procedure) whose address is specified by the LookupProc -+ parameter is called by the Disassembler (if LookupProc is not NIL) to -+ do the substitution (or A-trap comment) with a string returned by the -+ proc. It is assumed that the proc pointed to by LookupProc is a level 1 -+ Pascal proc declared as follows: -+ -+ PROCEDURE Lookup( PC: UNIV Ptr; {Addr of extension/trap word} -+ BaseReg: LookupRegs; {Base register/lookup mode } -+ Opnd: UNIV LongInt; {Trap word, PC addr, disp. } -+ VAR S: Str255); {Returned substitution } -+ -+ or in C, -+ -+ pascal void LookUp(Ptr PC, /* Addr of extension/trap word */ -+ LookupRegs BaseReg, /* Base register/lookup mode */ -+ long Opnd, /* Trap word, PC addr, disp. */ -+ char *S); /* Returned substitution */ -+ -+ PC = Pointer to instruction extension word or A-trap word in the -+ buffer pointed to by the Disassembler's FirstByte parameter. -+ -+ BaseReg = This determines the meaning of the Opnd value and supplies -+ the base register for the "∂(An)", "BD,An", and "*±∂" cases. -+ BaseReg may contain any one of the following values: -+ -+ _A0_ = 0 ==> A0 -+ _A1_ = 1 ==> A1 -+ _A2_ = 2 ==> A2 -+ _A3_ = 3 ==> A3 -+ _A4_ = 4 ==> A4 -+ _A5_ = 5 ==> A5 -+ _A6_ = 6 ==> A6 -+ _A7_ = 7 ==> A7 -+ _PC_ = 8 ==> PC-relative (special case) -+ _ABS_ = 9 ==> Abs addr (special case) -+ _TRAP_ = 10 ==> Trap word (special case) -+ _IMM_ = 11 ==> Immediate (special case) -+ -+ For absolute addressing (modes 70 and 71), BaseReg contains -+ _ABS_. For A-traps, BaseReg would contain _TRAP_. For -+ immediate data (mode 74), BaseReg would contain _IMM_. -+ -+ Opnd = The contents of this LongInt is determined by the BaseReg -+ parameter just described. -+ -+ For BaseReg = _IMM_ (immediate data): -+ Opnd contains the (extended) 32-bit immediate data specified -+ by the instruction. -+ -+ For BaseReg = _TRAP_ (A-traps): -+ Opnd is the entire trap word. The high order 16 bits of -+ Opnd are zero. -+ -+ For BaseReg = _ABS_ (absolute effective address): -+ Opnd contains the (extended) 32-bit address specifed by -+ the instruction's effective address. Such addresses would -+ generally be used to reference low memory globals on a -+ Macintosh. -+ -+ For BaseReg = _PC_ (PC-relative effective address): -+ Opnd contains the 32-bit address represented by "*±∂" -+ adjusted by the Disassembler's DstAdjust parameter. -+ -+ For BaseReg = _An_ (effective address with a base register): -+ Opnd contains the (sign-extended) 32-bit (base) -+ displacement from the instruction's effective address. -+ -+ In the Macintosh environment, a BaseReg specifying A5 -+ implies either global data references or Jump Table -+ references. Positive Opnd values with an A5 BaseReg thus -+ mean Jump Table references, while a negative offset would -+ mean a global data reference. Base registers of A6 or A7 -+ would usually mean local data. -+ -+ S = Pascal string returned from Lookup containing the effective -+ address substitution string or a trap name for A-traps. S is -+ set to null PRIOR to calling Lookup. If it is still null on -+ return, the string is not used. If not null, then for A-traps, -+ the returned string is used as the opcode string. In all other -+ cases the string is substituted as shown in the above table. -+ -+ Depending on the application, the caller has three choices on how to -+ use the Disassembler and an associated Lookup proc: -+ -+ (1). The caller can call just the Disassembler and provide his own Lookup -+ proc. In that case the calling conventions discussed above must be -+ followed. -+ -+ (2). The caller can provide NIL for the LookupProc parameter, in which -+ case, NO Lookup proc will be called. -+ -+ (3). The caller can call first InitLookup (described below, a proc -+ provided with this unit) and pass the address of this unit's -+ standard Lookup proc when Disassembler is called. In this case all -+ the control logic to determine the kind of substitution to be done -+ is provided for the caller and all that need to be provided by the -+ user are routines to look up any or all of the following: -+ -+ • PC-relative references -+ • Jump Table references -+ • Absolute address references -+ • Trap names -+ • Immediate data names -+ • References with offsets from base registers *) -+ -+ -+PROCEDURE InitLookup(PCRelProc, JTOffProc, TrapProc, AbsAddrProc, IdProc, ImmDataProc: UNIV Ptr); -+ {Prepare for use of this unit's Lookup proc. When Disassembler is called -+ and the address of this unit's Lookup proc is specified, then for immediate -+ data, PC-relative, Jump Table references, A-traps, absolute addresses, and -+ offsets from a base register, the associated level 1 Pascal proc -+ specified here is called (if not NIL -- all six addresses are preset to -+ NIL). The calls assume the following declarations for these procs (see -+ Lookup, below for further details): -+ -+ PROCEDURE PCRelProc(Address: UNIV LongInt; -+ VAR S: UNIV Str255); -+ -+ PROCEDURE JTOffProc(A5JTOffset: UNIV Integer; -+ VAR S: UNIV Str255); -+ -+ PROCEDURE TrapNameProc(TrapWord: UNIV Integer; -+ VAR S: UNIV Str255); -+ -+ PROCEDURE AbsAddrProc(AbsAddr: UNIV LongInt; -+ VAR S: UNIV Str255); -+ -+ PROCEDURE IdProc(BaseReg: LookupRegs; -+ Offset: UNIV LongInt; -+ VAR S: UNIV Str255); -+ -+ PROCEDURE ImmDataProc(ImmData: UNIV LongInt; -+ VAR S: UNIV Str255); -+ -+ Note: InitLookup contains initialized data which requires initializing -+ at load time (this is of concern only to users with assembler -+ main programs.} -+ -+ -+ PROCEDURE Lookup( PC: UNIV Ptr; {Addr of extension/trap word} -+ BaseReg: LookupRegs; {Base register/lookup mode } -+ Opnd: UNIV LongInt; {Trap word, PC addr, disp. } -+ VAR S: Str255); {Returned substitution } -+ {This is a standard Lookup proc available to the caller for calls to the -+ Disassembler. If the caller elects to use this proc, then InitLookup -+ MUST be called prior to any calls to the Disassembler. All the logic -+ to determine the type of lookup is done by this proc. For PC-relative, -+ Jump Table references, A-traps, absolute addresses, and offsets from a -+ base register, the associated level 1 Pascal proc specified in the -+ InitLookup call (if not NIL) is called. -+ -+ This scheme simplifies the Lookup mechanism by allowing the caller -+ to deal with just the problems related to the application.} -+ -+ -+PROCEDURE LookupTrapName(TrapWord: UNIV Integer; -+ VAR S: UNIV Str255); -+ {This is a procedure provided to allow conversion of a trap instruction -+ (in TrapWord) to its corresponding trap name (in S). It is provided -+ primarily for use with the Disassembler and its address may be passed to -+ InitLookup above for use by this unit's Lookup routine. Alternatively, -+ there is nothing prohibiting the caller from using it directly for other -+ purposes or by some other Lookup proc. -+ -+ Note: The tables in this proc make the size of this proc about 9500 -+ bytes. The trap names are fully spelled out in upper and lower -+ case.} -+ -+PROCEDURE ModifyOperand(VAR Operand: UNIV Str255); -+ {Scan an operand string, i.e., the null terminated Pascal string returned -+ by the Disassembler (null MUST be present here) and modify negative hex -+ values to negated positive value. For example, $FFFF(A5) would be -+ modified to -$0001(A5). The operand to be processed is passed as the -+ function's parameter which is edited "in place" and returned to the -+ caller. -+ -+ This routine is essentially a pattern matcher and attempts to only -+ modify 2, 4, and 8 digit hex strings in the operand that "might" be -+ offsets from a base register. If the matching tests are passed, the -+ same number of original digits are output (because that indicates a -+ value's size -- byte, word, or long). -+ -+ For a hex string to be modified, the following tests must be passed: -+ -+ • There must have been exactly 2, 4, or 8 digits. -+ -+ Only hex strings $XX, $XXXX, and $XXXXXXXX are possible candidates -+ because that is the only way the Disassembler generates offsets. -+ -+ • Hex string must be delimited by a "(" or a ",". -+ -+ The "(" allows offsets for $XXXX(An,...) and $XX(An,Xn) addressing -+ modes. The comma allows for the MC68020 addressing forms. -+ -+ • The "$X..." must NOT be preceded by a "±". -+ -+ This eliminates the possibility of modifying the offset of a -+ PC-relative addressing mode always generated in the form "*±$XXXX". -+ -+ • The "$X..." must NOT be preceded by a "#". -+ -+ This eliminates modifying immediate data. -+ -+ • Value must be negative. -+ -+ Negative values are the only values we modify. A value $FFFF is -+ modified to -$0001.} -+ -+FUNCTION validMacsBugSymbol(symStart, limit: UNIV Ptr; -+ symbol: StringPtr): StringPtr; C; -+ {Check that the bytes pointed to by symStart represents a valid MacsBug -+ symbol. The symbol must be fully contained in the bytes starting at -+ symStart, up to, but not including, the byte pointed to by the limit -+ parameter. -+ -+ If a valid symbol is NOT found, then NIL is returned as the function's -+ result. However, if a valid symbol is found, it is copied to symbol (if -+ it is not NIL) as a null terminated Pascal string, and return a pointer -+ to where we think the FOLLOWING module begins. In the "old style" cases -+ (see below) this will always be 8 or 16 bytes after the input symStart. -+ For new style Apple Pascal and C cases this will depend on the symbol -+ length, existence of a pad byte, and size of the constant (literal) area. -+ In all cases, trailing blanks are removed from the symbol. -+ -+ A valid MacsBug symbol consists of the characters '_', '%', spaces, -+ digits, and upper/lower case letters in a format determined by the first -+ two bytes of the symbol as follows: -+ -+ 1st byte | 2nd byte | Byte | -+ Range | Range | Length | Comments -+ ======================================================================= -+ $20 - $7F | $20 - $7F | 8 | "Old style" MacsBug symbol format -+ $A0 - $7F | $20 - $7F | 8 | "Old style" MacsBug symbol format -+ ----------------------------------------------------------------------- -+ $20 - $7F | $80 - $FF | 16 | "Old style" MacApp symbol ab==>b.a -+ $A0 - $7F | $80 - $FF | 16 | "Old style" MacApp symbol ab==>b.a -+ ----------------------------------------------------------------------- -+ $80 | $01 - $FF | n | n = 2nd byte (Apple symbol) -+ $81 - $9F | $00 - $FF | m | m = BAnd(1st byte,$7F) (Apple symbol) -+ ======================================================================= -+ -+ The formats are determined by whether bit 7 is set in the first and -+ second bytes. This bit will removed when we find it or'ed into the first -+ and/or second valid symbol characters. -+ -+ The first two formats in the above table are the basic "old style" (pre- -+ existing) MacsBug formats. The first byte may or may not have bit 7 set -+ the second byte is a valid symbol character. The first byte (with bit 7 -+ removed) and the next 7 bytes are assumed to comprise the symbol. -+ -+ The second pair of formats are also "old style" formats, but used for -+ MacApp symbols. Bit 7 set in the second character indicates these -+ formats. The symbol is assumed to be 16 bytes with the second 8 bytes -+ preceding the first 8 bytes in the generated symbol. For example, -+ 12345678abcdefgh represents the symbol abcdefgh.12345678. -+ -+ The last pair of formats are reserved by Apple and generated by the MPW -+ Pascal and C compilers. In these cases the value of the first byte is -+ always between $80 and $9F, or with bit 7 removed, between $00 and $1F. -+ For $00, the second byte is the length of the symbol with that many bytes -+ following the second byte (thus a max length of 255). Values $01 to $1F -+ represent the length itself. A pad byte may follow these variable length -+ cases if the symbol does not end on a word boundary. Following the -+ symbol and the possible pad byte is a word containing the size of the -+ constants (literals) generated by the compiler. -+ -+ Note that if symStart actually does point to a valid MacsBug symbol, -+ then you may use showMacsBugSymbol to convert the MacsBug symbol bytes to -+ a string that could be used as a DC.B operand for disassembly purposes. -+ This string explicitly shows the MacsBug symbol encodings.} -+ -+FUNCTION endOfModule(address, limit: UNIV Ptr; symbol: StringPtr; -+ VAR nextModule: UNIV Ptr): StringPtr; C; -+ {Check to see if the specified memory address, contains a RTS, JMP (A0) or -+ RTD #n instruction immediately followed by a valid MacsBug symbol. These -+ sequences are the only ones which can determine an end of module when -+ MacsBug symbols are present. During the check, the instruction and its -+ following MacsBug symbol must be fully contained in the bytes starting at -+ the specified address parameter, up to, but not including, the byte -+ pointed to by the limit parameter. -+ -+ If the end of module is NOT found, then NIL is returned as the -+ function's result. However, if a end of module is found, the MacsBug -+ symbol is returned in symbol (if it is not NIL) as a null terminated -+ Pascal string (with trailing blanks removed), and the functions returns -+ the pointer to the start of the MacsBug symbol (i.e., address+2 for RTS -+ or JMP (A0) and address+4 for RTD #n). This address may then be used as -+ in input parameter to showMacsBugSymbol to convert the MacsBug symbol to -+ a Disassembler operand string. -+ -+ Also returned in nextModule is where we think the FOLLOWING module -+ begins. In the "old style" cases (see validMacsBugSymbol) this will -+ always be 8 or 16 bytes after the input address. For new style the -+ Apple Pascal and C cases this will depend on the symbol length, existence -+ of a pad byte, and size of the constant (literal) area. See -+ validMacsBugSymbol for a description of valid MacsBug symbol formats.} -+ -+FUNCTION showMacsBugSymbol(symStart, limit: UNIV Ptr; operand: StringPtr; -+ VAR bytesUsed: Integer): StringPtr; C; -+ {Format a MacsBug symbol as a operand of a DC.B directive. The first one -+ or two bytes of the symbol are generated as $80+'c' if they have there -+ high high bits set. All other characters are shown as characters in a -+ string constant. The pad byte, if present, is one is also shown as $00. -+ -+ When called, showMacsBugSymbol assumes that symStart is pointing at a -+ valid MacsBug symbol as validated by the validMacsBugSymbol or -+ endOfModule routines. As with validMacsBugSymbol, the symbol must be -+ fully contained in the bytes starting at symStart up to, but not -+ including, the byte pointed to by the limit parameter. -+ -+ The string is returned in the 'operand' parameter as a null terminated -+ Pascal string. The function also returns a pointer to this string as its -+ return value (NIL is returned only if the byte pointed to by the limit -+ parameter is reached prior to processing the entire symbol -- which -+ should not happen if properly validated). The number of bytes used for -+ the symbol is returned in bytesUsed. Due to the way MacsBug symbols are -+ encoded, bytesUsed may not necessarily be the same as the length of the -+ operand string. -+ -+ A valid MacsBug symbol consists of the characters '_', '%', spaces, -+ digits, and upper/lower case letters in a format determined by the first -+ two bytes of the symbol as described in the validMacsBugSymbol routine.} -+ -+{$ENDC} { __USINGDISASMLOOKUP__ } -+ -+{$IFC NOT UsingIncludes} -+ END. -+{$ENDC} -+ -diff --git a/Interfaces/PInterfaces/DisAsmLookup.p.idump b/Interfaces/PInterfaces/DisAsmLookup.p.idump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/PInterfaces/DisAsmLookup.p.idump -@@ -0,0 +1 @@ -+TEXTMPS -\ No newline at end of file -diff --git a/Interfaces/PInterfaces/DisAsmLookup.p.rdump b/Interfaces/PInterfaces/DisAsmLookup.p.rdump -new file mode 100644 ---- /dev/null -+++ b/Interfaces/PInterfaces/DisAsmLookup.p.rdump -@@ -0,0 +1,430 @@ -+data 'MPSR' (1005) { -+ $"0009 4D6F 6E61 636F 0000 0000 029D A670" /* ..Monaco.......p */ -+ $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -+ $"0000 0006 0002 002A 001C 0357 0218 0029" /* .......*...W...) */ -+ $"0003 0198 01FB AA55 F483 0000 5AC6 0000" /* .......U....Z... */ -+ $"5AC6 0000 514D 0100" /* Z...QM.. */ -+}; -+ -+data 'MPSR' (1008) { -+ $"002A 001C 0357 0218 0029 0003 0198 01FB" /* .*...W...)...... */ -+ $"0000 514D 0000 0000 0000 0000 0000" /* ..QM.......... */ -+}; -+ +data 'unit' (2, "PackSyms") { + $"20CF DDCF 184B FCBF 8F06 3880 2F91 2795" /* ....K....8./.'. */ + $"7C07 E1C8 13AD FF87 A6E3 7A6F 31C1 C71E" /* |.........zo1... */ @@ -567555,13 +565106,28 @@ new file mode 100644 + $"0342 8000 0000 0533 2E34 2E32 2233 2E34" /* .B.....3.4.2"3.4 */ + $"2E32 2C20 A920 4170 706C 6520 436F 6D70" /* .2, . Apple Comp */ + $"7574 6572 2C20 496E 632E 2031 3939 36" /* uter, Inc. 1996 */ -+}; -+ -+data 'vers' (2, purgeable) { + }; + + data 'vers' (2, purgeable) { +- $"0320 6006 0000 0533 2E32 6236 094D 5057" /* . `....3.2b6.MPW */ +- $"2033 2E32 6236" /* 3.2b6 */ +-}; +- +-data 'ckid' (128, "Projector") { +- $"2368 E847 3FE5 3230 0004 0000 0000 0000" /* #h.G?.20........ */ +- $"0000 A933 7527 A933 7527 A5B5 F4B5 0008" /* ...3u'.3u'...... */ +- $"4E86 0000 0014 0001 2653 7570 6572 4D61" /* N.......&SuperMa */ +- $"7269 6F50 726F 6ABA 496E 7465 7266 6163" /* rioProj.Interfac */ +- $"6573 BA50 496E 7465 7266 6163 6573 BA00" /* es.PInterfaces.. */ +- $"0E43 6872 6973 2050 6574 6572 7365 6E00" /* .Chris Petersen. */ +- $"0131 000E 4469 7341 736D 4C6F 6F6B 5570" /* .1..DisAsmLookUp */ +- $"2E70 0000 0000 2846 6972 7374 2043 6865" /* .p....(First Che */ +- $"636B 496E 2028 5265 7669 7369 6F6E 2033" /* ckIn (Revision 3 */ +- $"2066 726F 6D20 5265 616C 6974 7929 2E00" /* from Reality).. */ + $"2300 8000 0000 0232 330A 452E 542E 4F2E" /* #......23.E.T.O. */ + $"2023 3233" /* #23 */ -+}; -+ + }; + diff --git a/Interfaces/PInterfaces/Disassembler.p b/Interfaces/PInterfaces/Disassembler.p new file mode 100644 --- /dev/null