Stricter instruction restart checks, and some machine config cleanup

devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.md

@@ -1,10 +1,11 @@
 ---
 layout: page
-title: "Columbia Data Products MPC 1600 with Color Display"
+title: "Columbia Data Products MPC 1600 with Color Display and Debugger"
 permalink: /devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/
 machines:
   - type: pc
     id: mpc1600
+    debugger: true
 ---
 
 {% include machine.html id="mpc1600" %}

devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml

@@ -5,11 +5,11 @@
 	<computer id="mpc1600-640k" name="MPC 1600"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
-	<rom id="romBIOS" addr="0xfd000" size="0x3000" file="/devices/pc/rom/cdp/bios/mpc1600/MPC4.34.json"/>
+	<rom ref="/devices/pc/rom/cdp/bios/mpc1600/mpc-443.xml"/>
 	<video ref="/devices/pc/video/cdp/cga/cdp-cga.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<chipset id="chipset"/>
+	<chipset id="chipset" model="mpc1600"/>
 </machine>

devices/pc/machine/cdp/mpc1600/cga/640kb/machine.xml

@@ -4,7 +4,7 @@
 	<name pos="center">Columbia Data Products MPC 1600 with Color Display</name>
 	<computer id="mpc1600-640k" name="MPC 1600"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
-	<rom id="romBIOS" addr="0xfd000" size="0x3000" file="/devices/pc/rom/cdp/bios/mpc1600/MPC4.34.json"/>
+	<rom ref="/devices/pc/rom/cdp/bios/mpc1600/mpc-443.xml"/>
 	<video ref="/devices/pc/video/cdp/cga/cdp-cga.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px" padbottom="8px">
@@ -12,5 +12,5 @@
 		<control type="button" binding="reset">Reset</control>
 	</cpu>
 	<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
-	<chipset id="chipset"/>
+	<chipset id="chipset" model="mpc1600"/>
 </machine>