diff --git a/mcdp/resources/targets/general/device.dtd b/mcdp/resources/targets/general/device.dtd
new file mode 100644
index 0000000..092ca4d
--- /dev/null
+++ b/mcdp/resources/targets/general/device.dtd
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- DTD for memory devices. -->
+
+<!ELEMENT device (attributes, size?, segment+, init?)>
+<!ATTLIST device
+		type CDATA #REQUIRED
+		width (1|2|4) #REQUIRED>
+<!ELEMENT segment (attributes?, base, size, subsegment*, subsegmentList?)>
+<!ATTLIST segment
+		name CDATA #REQUIRED>
+<!ELEMENT subsegment  (attributes?, base?, size?, subsegment*)>
+<!ATTLIST subsegment
+		name CDATA #REQUIRED>
+<!ELEMENT subsegmentList (attributes?, size)>
+<!ATTLIST subsegmentList
+		name CDATA #REQUIRED
+		numberOfEntries CDATA #REQUIRED
+		startID CDATA #IMPLIED>
+<!ELEMENT size (#PCDATA)>
+<!ELEMENT base (#PCDATA)>
+<!ELEMENT attributes EMPTY>
+<!ATTLIST attributes
+		mode (replace | change) #IMPLIED
+		read (add | remove) #IMPLIED
+		write (add | remove) #IMPLIED
+		const (add | remove) #IMPLIED
+		code (add | remove) #IMPLIED
+		var (add | remove) #IMPLIED
+		sysconst (add | remove) #IMPLIED
+		heap (add | remove) #IMPLIED
+		stack (add | remove) #IMPLIED>
+<!ELEMENT init (assignment+)>
+<!ELEMENT assignment (#PCDATA)>
+<!ATTLIST assignment
+		 name CDATA #REQUIRED
+		 type (value | uri) #REQUIRED>
\ No newline at end of file
diff --git a/mcdp/resources/targets/general/memoryMap.dtd b/mcdp/resources/targets/general/memoryMap.dtd
new file mode 100644
index 0000000..3870c45
--- /dev/null
+++ b/mcdp/resources/targets/general/memoryMap.dtd
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- DTD for MPC555 memoryMap. -->
+
+<!ELEMENT memorymap (xi:include+)>
+<!ATTLIST memorymap
+	xmlns:xi	CDATA 	#FIXED	"http://www.w3.org/2001/XInclude">
+<!ELEMENT xi:include EMPTY>
+<!ATTLIST xi:include
+    xmlns:xi        CDATA       #FIXED    "http://www.w3.org/2001/XInclude"
+    href            CDATA       #IMPLIED
+    parse           (xml|text)  "xml"
+    xpointer        CDATA       #IMPLIED
+    encoding        CDATA       #IMPLIED
+    accept          CDATA       #IMPLIED
+    accept-language CDATA       #IMPLIED
+>
\ No newline at end of file
diff --git a/mcdp/resources/targets/general/registerDictionary.dtd b/mcdp/resources/targets/general/registerDictionary.dtd
new file mode 100644
index 0000000..14bdf08
--- /dev/null
+++ b/mcdp/resources/targets/general/registerDictionary.dtd
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- DTD template for a RegisterDictionary.
+	Note: the type values are microcontroller specific and need to be adapted 
+	to the specific register used in this registerDict.
+-->
+
+<!ELEMENT registerDefinitions ((registerGroup*, register*) | (register*, registerGroup*))>
+<!ELEMENT registerGroup (register+)>
+<!ATTLIST registerGroup
+		baseAddress CDATA #REQUIRED>
+<!ELEMENT register (description?)>
+<!ATTLIST register
+		name CDATA #REQUIRED
+		type (type1|type2|type3) #REQUIRED
+		value CDATA #REQUIRED
+		size (1|2|4) #REQUIRED>
+<!ELEMENT description (#PCDATA)>
diff --git a/mcdp/resources/targets/mpc555/devices/deviceAm29LV160D.xml b/mcdp/resources/targets/mpc555/devices/deviceAm29LV160D.xml
new file mode 100644
index 0000000..b9575cc
--- /dev/null
+++ b/mcdp/resources/targets/mpc555/devices/deviceAm29LV160D.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!--  External Flash Description for the Motorola MPC555 Microcontroller  -->
+<!DOCTYPE device SYSTEM "../../general/device.dtd">
+
+<device type="Am29LV160D" width="2">
+	<attributes mode="change" read="add"></attributes>
+	<size>0x200000</size>
+	<segment name="ExternalFlash">
+		<base>ToppcKernel.CextRomBase</base>
+		<size>ToppcKernel.CextRomSize</size>
+		<subsegment name="ExcCode">
+			<attributes code="add"></attributes>
+			<size>ToppcKernel.excpCodeSize</size>
+		</subsegment>
+		<subsegment name="SysTab">
+			<attributes sysconst="add"></attributes>
+			<size>0x6000</size>
+		</subsegment>
+		<subsegment name="S1">
+			<attributes const="add" code="add"></attributes>
+			<size>0x4000</size>
+		</subsegment>
+		<subsegment name="S2">
+			<size>0x4000</size>
+		</subsegment>
+		<subsegment name="S3">
+			<size>0x10000</size>
+		</subsegment>
+		<subsegmentList name="S" numberOfEntries="30" startID="4">
+			<size>0x20000</size>
+		</subsegmentList>
+	</segment>
+	<init>
+		<assignment name="BR0" type="uri">ToppcKernel.pBR0</assignment>
+		<assignment name="OR0" type="uri">ToppcKernel.pOR0</assignment>
+	</init>
+</device>
\ No newline at end of file
diff --git a/mcdp/resources/targets/mpc555/devices/deviceMPC555Flash.xml b/mcdp/resources/targets/mpc555/devices/deviceMPC555Flash.xml
new file mode 100644
index 0000000..1d16329
--- /dev/null
+++ b/mcdp/resources/targets/mpc555/devices/deviceMPC555Flash.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!--  Internal Flash description for the Motorola MPC555 Microcontroller  -->
+<!DOCTYPE device SYSTEM "../../general/device.dtd">
+
+<device type="Ppc555Flash" width="4">
+	<attributes mode="replace" read="add"></attributes>
+	<segment name="InternalFlashA">
+		<base>0x2000</base>
+		<size>0x3E000</size>
+	</segment>
+	<segment name="InternalFlashB">
+		<base>0x40000</base>
+		<size>0x30000</size>
+	</segment>
+</device>
\ No newline at end of file
diff --git a/mcdp/resources/targets/mpc555/devices/deviceRAM.xml b/mcdp/resources/targets/mpc555/devices/deviceRAM.xml
new file mode 100644
index 0000000..2fadcf6
--- /dev/null
+++ b/mcdp/resources/targets/mpc555/devices/deviceRAM.xml
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- RAM description of the Motorola MPC555 Microcontroller  -->
+<!DOCTYPE device SYSTEM "../../general/device.dtd">
+
+<device type="RAM" width="4">
+	<attributes mode="change" read="add" write="add"></attributes>
+	<segment name="InternalFlashAblock0">
+		<attributes code="add"></attributes>
+		<base>0</base>
+		<size>0x2000</size>
+		<subsegment name="ExcCode">
+			<base>0</base>
+		</subsegment>
+	</segment>
+	<segment name="InternalRAM">
+		<base>ToppcKernel.CintRamBase</base>
+		<size>ToppcKernel.CintRamSize</size>
+		<subsegment name="SysTab">
+			<attributes sysconst="add"></attributes>
+			<base>ToppcKernel.sysTabAdr</base>
+		</subsegment>
+		<subsegment name="SegConst">
+			<attributes const="add"></attributes>
+		</subsegment>
+		<subsegment name="SegCode">
+			<attributes code="add"></attributes>
+		</subsegment>
+		<subsegment name="SegVars">
+			<attributes var="add"></attributes>
+		</subsegment>
+		<subsegment name="Stack">
+			<attributes stack="add"></attributes>
+			<size>ToppcKernel.stackSize</size>
+		</subsegment>
+	</segment>
+	<segment name="ExternalRAM">
+		<attributes mode="change"></attributes>
+		<base>ToppcKernel.CextRamBase</base>
+		<size>ToppcKernel.CextRamSize</size>
+		<subsegment name="Heap">
+			<attributes heap="add"></attributes>
+		</subsegment>
+	</segment>
+	<init>
+		<assignment name="BR0" type="uri">ToppcKernel.pBR0</assignment>
+		<assignment name="OR0" type="uri">ToppcKernel.pOR0</assignment>
+		<assignment name="BR1" type="uri">ToppcKernel.pBR1</assignment>
+		<assignment name="OR1" type="uri">ToppcKernel.pOR1</assignment>
+		<assignment name="DMBR" type="uri">
+			ToppcKernel.pDMBR
+		</assignment>
+		<assignment name="DMOR" type="uri">
+			ToppcKernel.pDMOR
+		</assignment>
+		<assignment name="ICTRL" type="value">7</assignment>
+		<!-- reset RSR -->
+		<assignment name="RSR" type="value">-1</assignment>
+		<!-- cause to enter debug mode -->
+		<assignment name="DER" type="value">0x31C7400F</assignment>
+		<!-- MSR -->
+		<assignment name="SRR1" type="value">0x03802</assignment>
+	</init>
+</device>
\ No newline at end of file
diff --git a/mcdp/resources/targets/mpc555/memoryAssignmentRAM.xml b/mcdp/resources/targets/mpc555/memoryAssignmentRAM.xml
index eaf1d6f..9ded604 100644
--- a/mcdp/resources/targets/mpc555/memoryAssignmentRAM.xml
+++ b/mcdp/resources/targets/mpc555/memoryAssignmentRAM.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 
-<!--  Memory Map for the Motorola MPC555 Microcontroller  -->
+<!--  Memory Assignment for the Motorola MPC555 Microcontroller  -->
 <!DOCTYPE sysclasses SYSTEM "memoryAssignment.dtd">
 
 <sysclasses>
diff --git a/mcdp/resources/targets/mpc555/memoryMap.dtd b/mcdp/resources/targets/mpc555/memoryMap.dtd
deleted file mode 100644
index 4d7c586..0000000
--- a/mcdp/resources/targets/mpc555/memoryMap.dtd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<!-- DTD for MPC555 memoryMap. -->
-
-<!ELEMENT memorymap (device+)>
-<!ELEMENT device (attributes, segment+)>
-<!ATTLIST device
-		type CDATA #REQUIRED
-		width (1|2|4) #REQUIRED>
-<!ELEMENT segment (attributes?, base, size, subsegment*)>
-<!ATTLIST segment
-		name CDATA #REQUIRED>
-<!ELEMENT subsegment (attributes?, base?, size?, subsegment*)>
-<!ATTLIST subsegment
-		name CDATA #REQUIRED>
-<!ELEMENT attributes (read?, write?, const?, code?, var?, sysconst?, heap?, stack?)>
-<!ELEMENT read EMPTY>
-<!ELEMENT write EMPTY>
-<!ELEMENT const EMPTY>
-<!ELEMENT code EMPTY>
-<!ELEMENT var EMPTY>
-<!ELEMENT sysconst EMPTY>
-<!ELEMENT heap EMPTY>
-<!ELEMENT stack EMPTY>
diff --git a/mcdp/resources/targets/mpc555/memoryMap.xml b/mcdp/resources/targets/mpc555/memoryMap.xml
index c4dced0..48a112e 100644
--- a/mcdp/resources/targets/mpc555/memoryMap.xml
+++ b/mcdp/resources/targets/mpc555/memoryMap.xml
@@ -1,414 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 
 <!--  Memory Map for the Motorola MPC555 Microcontroller  -->
-<!DOCTYPE memorymap SYSTEM "memoryMap.dtd">
+<!DOCTYPE memorymap SYSTEM "../general/memoryMap.dtd">
 
-<memorymap>
-	<device type="RAM" width="4">
-		<attributes>
-			<read></read>
-			<write></write>
-		</attributes>
-		<segment name="InternalFlashAblock0">
-			<attributes>
-				<read></read>
-				<write></write>
-				<code></code>
-			</attributes>
-			<base>0</base>
-			<size>0x2000</size>
-			<subsegment name="ExcCode">
-				<base>0</base>
-			</subsegment>
-		</segment>
-		<segment name="InternalRAM">
-			<attributes>
-				<read></read>
-				<write></write>
-				<const></const>
-				<code></code>
-				<var></var>
-				<sysconst></sysconst>
-				<heap></heap>
-				<stack></stack>
-			</attributes>
-			<base>ToppcKernel.CintRamBase</base>
-			<size>ToppcKernel.CintRamSize</size>
-			<subsegment name="SysTab">
-				<attributes>
-					<read></read>
-					<write></write>
-					<sysconst></sysconst>
-				</attributes>
-				<base>ToppcKernel.sysTabAdr</base>
-			</subsegment>
-			<subsegment name="SegConst">
-				<attributes>
-					<read></read>
-					<write></write>
-					<const></const>
-				</attributes>
-			</subsegment>
-			<subsegment name="SegCode">
-				<attributes>
-					<read></read>
-					<write></write>
-					<code></code>
-				</attributes>
-			</subsegment>
-			<subsegment name="SegVars">
-				<attributes>
-					<read></read>
-					<write></write>
-					<var></var>
-				</attributes>
-			</subsegment>
-			<subsegment name="Stack">
-				<attributes>
-					<read></read>
-					<write></write>
-					<stack></stack>
-				</attributes>
-				<size>ToppcKernel.stackSize</size>
-			</subsegment>
-		</segment>
-		<segment name="ExternalRAM">
-			<attributes>
-				<read></read>
-				<write></write>
-				<const></const>
-				<code></code>
-				<var></var>
-				<sysconst></sysconst>
-				<heap></heap>
-				<stack></stack>
-			</attributes>
-			<base>ToppcKernel.CextRamBase</base>
-			<size>ToppcKernel.CextRamSize</size>
-			<subsegment name="Heap">
-				<attributes>
-					<read></read>
-					<write></write>
-					<heap></heap>
-				</attributes>
-			</subsegment>
-		</segment>
-	</device>
-	<device type="Ppc555Flash" width="4">
-		<attributes>
-			<read></read>
-		</attributes>
-		<segment name="InternalFlashA">
-			<attributes>
-				<read></read>
-			</attributes>
-			<base>0x2000</base>
-			<size>0x3E000</size>
-		</segment>
-		<segment name="InternalFlashB">
-			<attributes>
-				<read></read>
-			</attributes>
-			<base>0x40000</base>
-			<size>0x30000</size>
-		</segment>
-	</device>
-	<device type="Am29LV160D" width="4">
-		<attributes>
-			<read></read>
-			<const></const>
-			<code></code>
-			<sysconst></sysconst>
-		</attributes>
-		<segment name="ExternalFlash">
-			<base>ToppcKernel.CextRomBase</base>
-			<size>ToppcKernel.CextRomSize</size>
-			<subsegment name="ExcCode">
-				<attributes>
-					<read></read>
-					<code></code>
-				</attributes>
-				<size>ToppcKernel.excpCodeSize</size>
-			</subsegment>
-			<subsegment name="SysTab">
-				<attributes>
-					<read></read>
-					<sysconst></sysconst>
-				</attributes>
-				<size>0x6000</size>
-			</subsegment>
-			<subsegment name="S1">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x4000</size>
-			</subsegment>
-			<subsegment name="S2">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x4000</size>
-			</subsegment>
-			<subsegment name="S3">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x10000</size>
-			</subsegment>
-			<subsegment name="S4">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S5">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S6">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S7">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S8">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S9">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S10">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S11">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S12">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S13">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S14">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S15">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S16">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S17">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S18">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S19">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S20">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S21">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S22">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S23">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S24">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S25">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S26">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S27">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S28">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S29">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S30">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S31">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S32">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S33">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-			<subsegment name="S34">
-				<attributes>
-					<read></read>
-					<const></const>
-					<code></code>
-				</attributes>
-				<size>0x20000</size>
-			</subsegment>
-		</segment>
-	</device>
+<memorymap xmlns:xi="http://www.w3.org/2001/XInclude">
+	<xi:include href="devices/deviceRAM.xml"></xi:include>
+	<xi:include href="devices/deviceMPC555Flash.xml"></xi:include>
+	<xi:include href="devices/deviceAm29LV160D.xml"></xi:include>
 </memorymap>
diff --git a/mcdp/resources/targets/mpc555/registerDictionary.xml b/mcdp/resources/targets/mpc555/registerDictionary.xml
index 2e1bbe8..b579422 100644
--- a/mcdp/resources/targets/mpc555/registerDictionary.xml
+++ b/mcdp/resources/targets/mpc555/registerDictionary.xml
@@ -219,13 +219,17 @@
 	<register name="CTR" type="SPR" value="9" size="4">
 		<description>Count Register</description>
 	</register>
-	
+
 	<!-- Supervisor-Level SPRs -->
 	<register name="SPR18" type="SPR" value="18" size="4">
-		<description>DAE/ Source Instruction Service Register (DSISR)</description>
+		<description>
+			DAE/ Source Instruction Service Register (DSISR)
+		</description>
 	</register>
 	<register name="DSISR" type="SPR" value="18" size="4">
-		<description>DAE/ Source Instruction Service Register</description>
+		<description>
+			DAE/ Source Instruction Service Register
+		</description>
 	</register>
 	<register name="SPR19" type="SPR" value="19" size="4">
 		<description>Data Address Register (DAR)</description>
@@ -312,7 +316,9 @@
 		<description>Processor Version Register</description>
 	</register>
 	<register name="SPR560" type="SPR" value="560" size="4">
-		<description>I-Cache Control and Status Register (ICCST)</description>
+		<description>
+			I-Cache Control and Status Register (ICCST)
+		</description>
 	</register>
 	<register name="ICCST" type="SPR" value="560" size="4">
 		<description>I-Cache Control and Status Register</description>
@@ -330,10 +336,14 @@
 		<description>I-Cache Data Port</description>
 	</register>
 	<register name="SPR1022" type="SPR" value="1022" size="4">
-		<description>Floating-Point Exception Cause Register (FPECR)</description>
+		<description>
+			Floating-Point Exception Cause Register (FPECR)
+		</description>
 	</register>
 	<register name="FPECR" type="SPR" value="1022" size="4">
-		<description>Floating-Point Exception Cause Register</description>
+		<description>
+			Floating-Point Exception Cause Register
+		</description>
 	</register>
 
 	<!-- Development Support SPRs -->
@@ -374,16 +384,24 @@
 		<description>Debug Enable Register</description>
 	</register>
 	<register name="SPR150" type="SPR" value="150" size="4">
-		<description>Breakpoint Counter A Value and Control (COUNTA)</description>
+		<description>
+			Breakpoint Counter A Value and Control (COUNTA)
+		</description>
 	</register>
 	<register name="COUNTA" type="SPR" value="150" size="4">
-		<description>Breakpoint Counter A Value and Control</description>
+		<description>
+			Breakpoint Counter A Value and Control
+		</description>
 	</register>
 	<register name="SPR151" type="SPR" value="151" size="4">
-		<description>Breakpoint Counter B Value and Control (COUNTB)</description>
+		<description>
+			Breakpoint Counter B Value and Control (COUNTB)
+		</description>
 	</register>
 	<register name="COUNTB" type="SPR" value="151" size="4">
-		<description>Breakpoint Counter B Value and Control</description>
+		<description>
+			Breakpoint Counter B Value and Control
+		</description>
 	</register>
 	<register name="SPR152" type="SPR" value="152" size="4">
 		<description>Comparator E Value Register (CMPE)</description>
@@ -410,19 +428,25 @@
 		<description>Comparator H Value Register</description>
 	</register>
 	<register name="SPR156" type="SPR" value="156" size="4">
-		<description>L-Bus Support Comparators Control (LCTRL1)</description>
+		<description>
+			L-Bus Support Comparators Control (LCTRL1)
+		</description>
 	</register>
 	<register name="LCTRL1" type="SPR" value="156" size="4">
 		<description>L-Bus Support Comparators Control</description>
 	</register>
 	<register name="SPR157" type="SPR" value="157" size="4">
-		<description>L-Bus Support Comparators Control (LCTRL2)</description>
+		<description>
+			L-Bus Support Comparators Control (LCTRL2)
+		</description>
 	</register>
 	<register name="LCTRL2" type="SPR" value="157" size="4">
 		<description>L-Bus Support Comparators Control</description>
 	</register>
 	<register name="SPR158" type="SPR" value="158" size="4">
-		<description>I-Bus Suupport Control Register (ICTRL)</description>
+		<description>
+			I-Bus Suupport Control Register (ICTRL)
+		</description>
 	</register>
 	<register name="ICTRL" type="SPR" value="158" size="4">
 		<description>I-Bus Suupport Control Register</description>
@@ -439,7 +463,7 @@
 	<register name="DPDR" type="SPR" value="630" size="4">
 		<description>Development Port Data Register</description>
 	</register>
-	
+
 	<!-- USIU Special-Purpose Register -->
 	<register name="SPR268" type="SPR" value="268" size="4">
 		<description>Time Base Lower - Read (TBL)</description>
@@ -474,7 +498,9 @@
 		<description>Count Register</description>
 	</register>
 	<register name="FPSCR" type="FPSCR" value="1" size="4">
-		<description>Floating-Point Status and Control Register</description>
+		<description>
+			Floating-Point Status and Control Register
+		</description>
 	</register>
 	<register name="BR0" type="CtrlReg" value="0x2FC100" size="4">
 		<description>Memory Control Base Register 0</description>