From 0c45ef1b5aebf5cb9ac70699d0e51572f215a7bb Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Mon, 11 Apr 1988 11:03:22 +0000
Subject: [PATCH] adapted to new semantics of the EHEAP error: no longer fatal

---
 mach/pdp/int/em_int.s  | 6 ++++--
 mach/pdp/libem/strhp.s | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mach/pdp/int/em_int.s b/mach/pdp/int/em_int.s
index 2ff7cfd07..d3d6eec08 100644
--- a/mach/pdp/int/em_int.s
+++ b/mach/pdp/int/em_int.s
@@ -2964,8 +2964,10 @@ str.s0:	clr	r0;		bisb	(pcx)+,r0
 	blos	5f;		add	$unixextra,sybreak+2;
 	sys	indir;sybreak		/ ask for more core
 	jec	5b;
+1:
 	jsr	pc,e.heap;		   / core claim	failed
-5:	cmp	r1,globmax;	jlo	e.heap;
+	next
+5:	cmp	r1,globmax;	jlo	1b
 	mov	r1,hp;		next
 
 /------------------------------------------------------------------------------
@@ -3161,7 +3163,7 @@ e.badmon:	mov	$EBADMON,-(sp);	       br      error
 e.case:		mov	$ECASE,-(sp);	       br      fatal
 e.oddz:		mov	$EODDZ,-(sp);	       br      fatal
 e.illins:	mov	$EILLINS,-(sp);	       br      fatal
-e.heap:		mov	$EHEAP,-(sp);	       br      fatal
+e.heap:		mov	$EHEAP,-(sp);	       br      error
 e.memflt:	mov	$EMEMFLT,-(sp);	       br      fatal
 e.badgto:	mov	$EBADGTO,-(sp);		br	error
 /------------------------------------------------------------------------------
diff --git a/mach/pdp/libem/strhp.s b/mach/pdp/libem/strhp.s
index 8e9b10dbd..4c2a81423 100644
--- a/mach/pdp/libem/strhp.s
+++ b/mach/pdp/libem/strhp.s
@@ -1,7 +1,7 @@
 .sect .text; .sect .rom; .sect .data; .sect .bss; .sect .text
 .sect .text
 .define strhp~
-.extern fat~,reghp~,_end
+.extern trp~,reghp~,_end
 ! $Header$
 indir	= 0
 
@@ -21,6 +21,7 @@ strhp~:
 	bcs	3f
 1:	jmp	(r0)
 3:	mov	$EHEAP,-(sp)
-	jmp	fat~
+	jsr	trp~
+	jmp	(r0)
 .sect .data
 2:	sys	break; .data2 _end
-- 
2.34.1