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

diff --git a/mach/i86/libem/strhp.s b/mach/i86/libem/strhp.s
index 1dd17a9..4e89c63 100644 (file)
--- a/mach/i86/libem/strhp.s
+++ b/mach/i86/libem/strhp.s
@@ -1,7 +1,7 @@
 .sect .text; .sect .rom; .sect .data; .sect .bss
 .sect .text
 .define        .strhp
-.extern .reghp, .limhp, EHEAP, .fat
+.extern .reghp, .limhp, EHEAP, .trp
 
 .strhp:
        pop     bx
@@ -18,4 +18,6 @@
        jmp     bx
 2:
        mov     ax,EHEAP
-       jmp     .fat
+       push    ax
+       call    .trp
+       jmp     bx

diff --git a/mach/m68020/libem/printf.s b/mach/m68020/libem/printf.s
index 088a08a..0ec7553 100644 (file)
--- a/mach/m68020/libem/printf.s
+++ b/mach/m68020/libem/printf.s
@@ -8,11 +8,11 @@ _getal:
        .space  12
 _char:
        .space  1
-       .align  2
+       .align  4
 .sect .data
 hexs:
        .ascii  "0123456789abcdef"
-       .align  2
+       .align  4
 .sect .text
 _printf:
        movem.l d0/d1/d2/a0/a1/a2/a3/a4/a5/a6, -(sp)

diff --git a/mach/m68020/libem/shp.s b/mach/m68020/libem/shp.s
index c7b1945..582f45c 100644 (file)
--- a/mach/m68020/libem/shp.s
+++ b/mach/m68020/libem/shp.s
@@ -22,5 +22,6 @@
        jmp     (a0)            ! return
 2:
        move.l  #EHEAP, -(sp)
-       jmp     (.fatal)
+       jsr     (.trp)
+       jmp     (a0)
 .align 2