adapted to new semantics of the EHEAP error: no longer fatal

diff --git a/mach/m68k2/libem/shp.s b/mach/m68k2/libem/shp.s
index 912af4f..e9f4f6c 100644 (file)
--- a/mach/m68k2/libem/shp.s
+++ b/mach/m68k2/libem/shp.s
@@ -25,4 +25,5 @@
        jmp     (a0)
 2:
        move.w  #EHEAP,-(sp)
-       jmp     .fat
+       jsr     .trp
+       jmp     (a0)

diff --git a/mach/m68k4/libem/shp.s b/mach/m68k4/libem/shp.s
index 3838238..ac5c3fa 100644 (file)
--- a/mach/m68k4/libem/shp.s
+++ b/mach/m68k4/libem/shp.s
@@ -23,5 +23,8 @@
        rts
 2:
        move.l  #EHEAP, -(sp)
-       jmp     .fatal
+       jsr     .trp
+       move.l  (sp)+,a0
+       move.l  a0,(sp)
+       rts
 .align 2

diff --git a/mach/mantra/int/mloop9 b/mach/mantra/int/mloop9
index 2774355..3f3acb4 100644 (file)
--- a/mach/mantra/int/mloop9
+++ b/mach/mantra/int/mloop9
@@ -185,8 +185,8 @@ str_s0:             move.l  d6,d0   ;       move.b  (a3)+,d0
 3:             move.l  d1,-(sp)
                move.l  d1,-(sp) ;      add.l   #1280,(sp)
                bsr     _Xbreak ;       testen  (sp)+
-4:             bne     e_heap  ;
-               move.l  (sp)+,d1 ;      bra     5b
+4:             beq     1f ;            bsr     e_heap ;        jmp     (a4)
+1:             move.l  (sp)+,d1 ;      bra     5b
 
 !----------------------------------------------------------------------------
 rck_z:         mov     (sp)+,d0 ;      bra     0f

diff --git a/mach/mantra/int/mloopa b/mach/mantra/int/mloopa
index caecf5e..1baac59 100644 (file)
--- a/mach/mantra/int/mloopa
+++ b/mach/mantra/int/mloopa
@@ -16,7 +16,7 @@ e_iund:               mov     #0x8,-(sp) ;    bra     error
 e_fund:                mov     #0x9,-(sp) ;    bra     error
 e_conv:                mov     #0xA,-(sp) ;    bra     error
 e_stack:       mov     #0x10,-(sp) ;   bra     fatal
-e_heap:                mov     #0x11,-(sp) ;   bra     fatal
+e_heap:                mov     #0x11,-(sp) ;   bra     error
 e_illins:      mov     #0x12,-(sp) ;   bra     fatal
 e_oddz:                mov     #0x13,-(sp) ;   bra     fatal
 e_case:                mov     #0x14,-(sp) ;   bra     fatal