From 5a75505e8bf51452aa0c02efdef607c3b9815774 Mon Sep 17 00:00:00 2001
From: Adam Sampson <ats@offog.org>
Date: Mon, 23 Apr 2018 16:10:04 +0100
Subject: [PATCH] Avoid collision with .FATAL, DMOVE and DMOVEM.

Newer MIDAS defines all of these itself; Muddle wants its own
definitions.
---
 src/mudsys/{initm.373 => initm.374} | 1 +
 src/mudsys/uuoh.184                 | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename src/mudsys/{initm.373 => initm.374} (99%)

diff --git a/src/mudsys/initm.373 b/src/mudsys/initm.374
similarity index 99%
rename from src/mudsys/initm.373
rename to src/mudsys/initm.374
index bbd8fe69..6132d962 100644
--- a/src/mudsys/initm.373
+++ b/src/mudsys/initm.374
@@ -12,6 +12,7 @@ SYSQ
 XBLT==123000,,
 GCHN==0
 IFE ITS,[
+EXPUNGE .FATAL
 FATINS==.FATAL"
 SEVEC==104000,,204
 .INSRT STENEX >
diff --git a/src/mudsys/uuoh.184 b/src/mudsys/uuoh.184
index ebda9ef3..5d0c08d0 100644
--- a/src/mudsys/uuoh.184
+++ b/src/mudsys/uuoh.184
@@ -26,9 +26,11 @@ G==F+1
 
 UUOTBL:	ILLUUO
 
+EXPUNG .FATAL
+
 IRP UUOS,,[[DP,DODP],[.MCALL,DMCALL],[.ACALL,DACALL],[.ECALL,DECALL],[.SAVAC,DSAVAC]
 [.FATAL,DFATAL],[.ERRUU,DOERR],[.POPUN,DPOPUN],[.LSAVA,DLSAVA]
-[SHRRM,DHRRM],[SHRLM,DHRLM],[SXBLT,DXBLT],[SMOVEM,DMOVEM],[SHLRZ,DHLRZ],[SSETZM,DSETZM],[SMOVE,DMOVE]]
+[SHRRM,DHRRM],[SHRLM,DHRLM],[SXBLT,DXBLT],[SMOVEM,DMOVMX],[SHLRZ,DHLRZ],[SSETZM,DSETZM],[SMOVE,DMOVEX]]
 UUFOO==.IRPCNT+1
 IRP UUO,DISP,[UUOS]
 .GLOBAL UUO
@@ -1055,13 +1057,13 @@ DPOPUN:	PUSHJ	P,POPUNW
 
 ; HERE FOR MULTI SEG SIMULATION STUFF
 
-DMOVE:	MOVSI	C,(MOVE)
+DMOVEX:	MOVSI	C,(MOVE)
 	JRST	MEX
 DHRRM:	MOVSI	C,(HRRM)
 	JRST	MEX
 DHRLM:	MOVSI	C,(HRLM)
 	JRST	MEX
-DMOVEM:	MOVSI	C,(MOVEM)
+DMOVMX:	MOVSI	C,(MOVEM)
 	JRST	MEX
 DHLRZ:	MOVSI	C,(HLRZ)
 	JRST	MEX