Trap Logging & templated calling conventions

docs/ROMinfo

@@ -103,7 +103,7 @@ Minor work that needs to be done
 
 	OpenCPicture just calls OpenPicture.
 
-	RestoreClutDevice needs work
+	RestoreDeviceClut needs work
 
 	inverse color table routines don't do a good job of discriminating
 	between colors that are close to each other.

docs/faq.xml

@@ -2087,7 +2087,7 @@ GetStdFilterProc, SetDialogCancelItem, SetDialogTracksCursor, OutlineMetrics, Fl
 <para>
 GDeviceChanged, PortChanged, PixPatChanged and CTabChanged are poorly
 implemented.  GetCPixel doesn't work for bpp > 8.  OpenCPicture just
-calls OpenPicture.  RestoreClutDevice's implementation is shaky.  Our
+calls OpenPicture.  RestoreDeviceClut's implementation is shaky.  Our
 inverse color table routines don't do a good job of discriminating
 between colors that are close to each other.
 </para> 

docs/faq/t1.html

@@ -4305,7 +4305,7 @@
 ><P
 >&#13;GDeviceChanged, PortChanged, PixPatChanged and CTabChanged are poorly
 implemented.  GetCPixel doesn't work for bpp &#62; 8.  OpenCPicture just
-calls OpenPicture.  RestoreClutDevice's implementation is shaky.  Our
+calls OpenPicture.  RestoreDeviceClut's implementation is shaky.  Our
 inverse color table routines don't do a good job of discriminating
 between colors that are close to each other.
 </P

docs/unimplemented

@@ -65,4 +65,4 @@ with System 7.0
 
 GDeviceChanged, PortChanged, PixPatChanged and CTabChanged are poorly
 implemented.  GetCPixel doesn't work for bpp > 8.  OpenCPicture just
-calls OpenPicture.  RestoreClutDevice's implementation is shakey.
+calls OpenPicture.  RestoreDeviceClut's implementation is shakey.

src/AE.cpp

@@ -18,6 +18,7 @@
 
 #include "rsys/mman.h"
 #include "rsys/flags.h"
+#include "rsys/functions.impl.h"
 
 namespace Executor
 {
@@ -555,7 +556,7 @@ OSErr Executor::C_AEDisposeToken(AEDesc *theToken)
     return noErr;
 }
 
-OSErr Executor::C_AEREesolve(AEDesc *objectSpecifier, INTEGER callbackFlags,
+OSErr Executor::C_AEResolve(AEDesc *objectSpecifier, INTEGER callbackFlags,
                              AEDesc *theToken)
 {
     warning_unimplemented(NULL_STRING);

src/AE_desc.cpp

@@ -1093,7 +1093,7 @@ OSErr Executor::C_AEGetAttributePtr(AppleEvent *evt, AEKeyword keyword,
                    data, max_size, size_out);
     AE_RETURN_ERROR(AEDisposeDesc(coerced_desc));
 }
-
+/* This does not exist.
 OSErr Executor::C_AEDeleteAttribute(AppleEvent *evt, AEKeyword keyword)
 {
     if(!APPLE_EVENT_CLASS_P(evt))
@@ -1104,7 +1104,7 @@ OSErr Executor::C_AEDeleteAttribute(AppleEvent *evt, AEKeyword keyword)
     else
         AE_RETURN_ERROR(noErr);
 }
-
+*/
 OSErr Executor::C_AESizeOfAttribute(AppleEvent *evt, AEKeyword keyword,
                                     GUEST<DescType> *type_out,
                                     GUEST<Size> *size_out)

src/AE_hdlr.cpp

@@ -134,7 +134,7 @@ hdlr_table_elt(AE_hdlr_table_h table,
 }
 
 OSErr Executor::C__AE_hdlr_table_alloc(int32_t unknown_1, int32_t unknown_2,
-                                       int32_t unknown_3, int8 unknown_p,
+                                       int32_t unknown_3, int8_t unknown_p,
                                        GUEST<AE_hdlr_table_h> *table_return)
 {
     AE_hdlr_table_h table;
@@ -424,6 +424,7 @@ OSErr Executor::C_AEInstallSpecialHandler(
     if(function_class == keySelectProc)
     {
         AE_OSL_select_fn = US_TO_SYN68K((void *)hdlr_fn);
+        warning_unimplemented("AEInstallSpecialHandler: keySelectProc set");
         AE_RETURN_ERROR(noErr);
     }
 

src/CMakeLists.txt

@@ -50,7 +50,6 @@ add_subdirectory(config/arch/generic_le)
 add_subdirectory(config/os/win32)
 add_subdirectory(config/os/macosx)
 
-
 function(linkheader from to variant)
     if(DEFINED ARGV3)
         set(input ${ARGV3})
@@ -177,19 +176,21 @@ set(num_sources bindec.cpp float4.cpp float5.cpp float7.cpp floatnext.cpp toolma
     mathlib.cpp)
 source_group(Numerics FILES ${num_sources})
 
-set(misc_sources desk.cpp device.cpp disk.cpp diskinit.cpp dump.cpp trapname.cpp font.cpp
+set(misc_sources
+  traps.cpp logging.cpp
+  desk.cpp device.cpp disk.cpp diskinit.cpp dump.cpp trapname.cpp font.cpp
   gestalt.cpp globals.cpp iu.cpp launch.cpp main.cpp mman.cpp mmansubr.cpp notify.cpp hle.cpp
   osevent.cpp osutil.cpp pack.cpp scrap.cpp script.cpp segment.cpp serial.cpp
   slash.cpp stdfile.cpp romlib_stubs.cpp syserr.cpp toolevent.cpp toolutil.cpp time.cpp
   vbl.cpp syncint.cpp virtualint.cpp refresh.cpp autorefresh.cpp aboutbox.cpp
-  option.cpp parseopt.cpp parsenum.cpp desperate.cpp
+  option.cpp parseopt.cpp parsenum.cpp
   version.cpp shutdown.cpp uniquefile.cpp screen-dump.cpp
   process.cpp alias.cpp string.cpp tempmem.cpp edition.cpp fontIMVI.cpp balloon.cpp
   error.cpp adb.cpp color_wheel_bits.cpp finder.cpp system_error.cpp ibm_keycodes.cpp
   icon.cpp redrawscreen.cpp ini.cpp checkpoint.cpp qt.cpp
   paramline.c fauxdbm.cpp commtool.cpp cfm.cpp pef_hash.cpp
   interfacelib.cpp mixed_mode.cpp suffix_maps.cpp appearance.cpp lockrange.cpp
-  emutrap.cpp emutraptables.cpp emustubs.cpp unix_like.cpp parse.ypp check_structs.cpp
+  emutrap.cpp emustubs.cpp unix_like.cpp parse.ypp check_structs.cpp
   executor.cpp  crc.cpp)
 
 set(include_sources hintemplate.h
@@ -255,7 +256,6 @@ set(include_sources hintemplate.h
                   include/rsys/dcache.h
                   include/rsys/depthconv.h
                   include/rsys/desk.h
-                  include/rsys/desperate.h
                   include/rsys/device.h
                   include/rsys/dial.h
                   include/rsys/dirtyrect.h
@@ -274,6 +274,8 @@ set(include_sources hintemplate.h
                   include/rsys/float_fcw.h
                   include/rsys/floatconv.h
                   include/rsys/font.h
+                  include/rsys/functions.h
+                  include/rsys/functions.impl.h
                   include/rsys/gestalt.h
                   include/rsys/glue.h
                   include/rsys/gworld.h
@@ -292,6 +294,7 @@ set(include_sources hintemplate.h
                   include/rsys/launch.h
                   include/rsys/list.h
                   include/rsys/lockunlock.h
+                  include/rsys/logging.h
                   include/rsys/lowglobals.h
                   include/rsys/m68kint.h
                   include/rsys/macros.h
@@ -322,7 +325,6 @@ set(include_sources hintemplate.h
                   include/rsys/print.h
                   include/rsys/process.h
                   include/rsys/PSstrings.h
-                  include/rsys/pstuff.h
                   include/rsys/qcolor.h
                   include/rsys/quick.h
                   include/rsys/rawblt.h
@@ -357,7 +359,8 @@ set(include_sources hintemplate.h
                   include/rsys/toolutil.h
                   include/rsys/trapglue.h
                   include/rsys/trapname.h
-                  include/rsys/types.h
+                  include/rsys/traps.h
+                  include/rsys/traps.impl.h
                   include/rsys/uniquefile.h
                   include/rsys/vbl.h
                   include/rsys/vdriver.h
@@ -387,12 +390,15 @@ set(include_sources hintemplate.h
                   mkvol/mkvol.h
                   mkvol/mkvol_internal.h)
 
+include(trap_instances/trap_instances.cmake)
+
 set(sources ${ctl_sources} ${dial_sources} 
     ${list_sources} ${menu_sources}
     ${print_sources} ${qd_sources} ${res_sources}
     ${te_sources} ${wind_sources} ${ae_sources}
     ${sound_sources} ${num_sources} ${misc_sources}
     ${file_sources} ${hfs_sources}
+    ${trap_instance_sources}
     ${include_sources})
 
 add_executable(executor ${sources}
@@ -408,3 +414,4 @@ else()
 endif()
 
 target_link_libraries(executor Threads::Threads syn68k)
+

src/PSprint.cpp

@@ -1359,7 +1359,7 @@ num_image_bytes(int numbytes, int pixelsize, int direct_color_p)
 #define ROWMASK 0x1FFF
 #endif
 
-void Executor::NeXTPrBits(BitMap *srcbmp, Rect *srcrp, Rect *dstrp,
+void Executor::NeXTPrBits(const BitMap *srcbmp, const Rect *srcrp, const Rect *dstrp,
                           LONGINT mode, RgnHandle mask, GrafPtr thePortp)
 {
     float scalex, scaley;

src/aboutbox.cpp

@@ -117,7 +117,7 @@ static struct
 static WindowPtr about_box;
 static ControlHandle about_scrollbar;
 static TEHandle about_te;
-static ProcPtr scroll_bar_callback;
+static ControlActionUPP scroll_bar_callback;
 
 enum
 {
@@ -649,7 +649,7 @@ event_loop(bool executor_p)
 
                         if(TrackControl(c, local_pt,
                                         (part == inThumb
-                                             ? (ProcPtr)-1
+                                             ? (ControlActionUPP)-1
                                              : scroll_bar_callback))
                            == inThumb)
                         {
@@ -664,7 +664,7 @@ event_loop(bool executor_p)
 
                         old_scroll_bar_value = GetCtlValue(about_scrollbar);
                     }
-                    else if(TrackControl(c, local_pt, (ProcPtr)-1)
+                    else if(TrackControl(c, local_pt, (ControlActionUPP)-1)
                             == inButton)
                     {
                         int new_text;
@@ -702,8 +702,8 @@ void Executor::do_about_box(void)
     {
         busy_p = true; /* Only allow one about box at a time. */
 
-        if(scroll_bar_callback == 0)
-            scroll_bar_callback = (ProcPtr)SYN68K_TO_US(callback_install(scroll_stub, NULL));
+        if(scroll_bar_callback == nullptr)
+            scroll_bar_callback = (ControlActionUPP)SYN68K_TO_US(callback_install(scroll_stub, NULL));
 
         {
             TheZoneGuard guard(LM(SysZone));

src/adb.cpp

@@ -8,7 +8,6 @@
 #include "ADB.h"
 #include "rsys/adb.h"
 #include "rsys/osevent.h"
-#include "rsys/pstuff.h"
 
 #include <stdarg.h>
 /*
@@ -64,7 +63,7 @@ enum
     SPOOFED_MOUSE_ADDR = 3
 };
 
-static GUEST<Ptr> adb_service_procp = nullptr; /* stored as though in lowglobal */
+static GUEST<ProcPtr> adb_service_procp = nullptr; /* stored as though in lowglobal */
 static Ptr adb_data_ptr = (Ptr)0x90ABCDEF;
 
 void
@@ -91,7 +90,7 @@ Executor::GetIndADB(ADBDataBlock *adbp, INTEGER index)
         adbp->devType = CB(0); /* should check on Mac to see what mouse is */
         adbp->origADBAddr = CB(SPOOFED_MOUSE_ADDR);
         if(!adb_service_procp)
-            adb_service_procp = RM((Ptr)P_adb_service_stub);
+            adb_service_procp = RM((ProcPtr)&adb_service_stub);
         adbp->dbServiceRtPtr = adb_service_procp;
         adbp->dbDataAreaAddr = RM(adb_data_ptr);
         retval = SPOOFED_MOUSE_ADDR;
@@ -132,7 +131,7 @@ Executor::SetADBInfo(ADBSetInfoBlock *adbp, INTEGER address)
 static bool
 adb_vector_is_not_our_own(void)
 {
-    return adb_service_procp && adb_service_procp != RM((Ptr)P_adb_service_stub);
+    return adb_service_procp && adb_service_procp != RM((ProcPtr)&adb_service_stub);
 }
 
 static void

src/bindec.cpp

@@ -10,7 +10,7 @@
 
 using namespace Executor;
 
-void Executor::NumToString(LONGINT l, StringPtr s)
+void Executor::C_NumToString(LONGINT l, StringPtr s)
 {
     Byte *p = s + 1;
     LONGINT d;
@@ -49,7 +49,7 @@ void Executor::NumToString(LONGINT l, StringPtr s)
     s[0] = p - (s + 1);
 }
 
-void Executor::StringToNum(StringPtr s, LONGINT *lp)
+void Executor::C_StringToNum(StringPtr s, LONGINT *lp)
 {
     char *p = (char *)s + 1;
     char *ep = p + s[0];

src/blockdev.cpp

@@ -81,9 +81,9 @@ bool Executor::blockdev_read(blockdev_t *b, uint32_t offset, void *buf, uint32_t
 
         for(n = 0; n < num_bytes;)
         {
-            uint8 *p;
+            uint8_t *p;
 
-            p = (uint8 *)buf + n;
+            p = (uint8_t *)buf + n;
 
             /* First try to read from the cache. */
             if(dcache_read(b->dcache_tag, p, offset + n, b->block_size))
@@ -144,9 +144,9 @@ bool Executor::blockdev_write(blockdev_t *b, uint32_t offset, const void *buf,
         for(n = 0; n < num_bytes;)
         {
             uint32_t bytes_to_write;
-            uint8 *p;
+            uint8_t *p;
 
-            p = (uint8 *)buf + n;
+            p = (uint8_t *)buf + n;
 
             /* Seek if necessary. */
             if(offset + n != b->fpos)