trying to add dstruct tags

org.efry.z80editor.ide/src/org/efry/z80editor/ide/Z80IdeModule.xtend

@@ -0,0 +1,11 @@
+/*
+ * generated by Xtext 2.20.0
+ */
+package org.efry.z80editor.ide
+
+
+/**
+ * Use this class to register ide components.
+ */
+class Z80IdeModule extends AbstractZ80IdeModule {
+}

org.efry.z80editor.ide/src/org/efry/z80editor/ide/Z80IdeSetup.xtend

@@ -0,0 +1,20 @@
+/*
+ * generated by Xtext 2.20.0
+ */
+package org.efry.z80editor.ide
+
+import com.google.inject.Guice
+import org.eclipse.xtext.util.Modules2
+import org.efry.z80editor.Z80RuntimeModule
+import org.efry.z80editor.Z80StandaloneSetup
+
+/**
+ * Initialization support for running Xtext languages as language servers.
+ */
+class Z80IdeSetup extends Z80StandaloneSetup {
+
+	override createInjector() {
+		Guice.createInjector(Modules2.mixin(new Z80RuntimeModule, new Z80IdeModule))
+	}
+
+}

org.efry.z80editor.target/org.efry.z80editor.target.target

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="org.efry.z80editor.target" sequenceNumber="1">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/releases/2019-12"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.1/"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.20.0/"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
+			<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
+			<unit id="org.junit" version="4.12.0.v201504281640"/>
+			<unit id="org.junit.jupiter.api" version="5.5.1.v20190826-0900"/>
+			<unit id="org.junit.jupiter.engine" version="5.5.1.v20190826-0900"/>
+			<unit id="org.junit.platform.commons" version="1.5.1.v20190826-0900"/>
+			<unit id="org.junit.platform.engine" version="1.5.1.v20190826-0900"/>
+			<unit id="org.junit.platform.launcher" version="1.5.1.v20190826-0900"/>
+			<unit id="org.junit.platform.runner" version="1.5.1.v20190826-0900"/>
+			<unit id="org.opentest4j" version="1.2.0.v20190826-0900"/>
+			<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/>
+			<unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/>
+			<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2019-12"/>
+		</location>
+	</locations>
+</target>

org.efry.z80editor.target/pom.xml

@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.efry.z80editor</groupId>
+		<artifactId>org.efry.z80editor.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.efry.z80editor.target</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+
+
+	<dependencies>
+	</dependencies>
+</project>

org.efry.z80editor.ui.tests/META-INF/MANIFEST.MF

@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.efry.z80editor.ui.tests
+Bundle-ManifestVersion: 2
+Bundle-Name: org.efry.z80editor.ui.tests
+Bundle-Vendor: My Company
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: org.efry.z80editor.ui.tests; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.efry.z80editor.ui,
+ org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.xtext.testing,
+ org.eclipse.xtext.xbase.testing,
+ org.eclipse.xtext.xbase.junit,
+ org.eclipse.core.runtime,
+ org.eclipse.xtext.ui.testing,
+ org.eclipse.ui.workbench;resolution:=optional
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.efry.z80editor.ui.tests;x-internal=true

org.efry.z80editor.ui.tests/pom.xml

@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.efry.z80editor</groupId>
+		<artifactId>org.efry.z80editor.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.efry.z80editor.ui.tests</artifactId>
+	<packaging>eclipse-test-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<configuration>
+					<useUIHarness>true</useUIHarness>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

org.efry.z80editor.ui/resources/z80opCodes/cp.html

@@ -20,6 +20,7 @@ <h2 id="toc0"><span>Syntax</span></h2>
 cp ixl
 cp iyh
 cp iyl
+cp (hl)
 cp (ix+n)
 cp (iy+n)
 cp n        ;8 bit constant</code>

org.efry.z80editor.ui/resources/z80opCodes/ex.html

@@ -35,10 +35,10 @@ <h2 id="toc4"><span>T-States</span></h2>
 </tr>
 <tr>
 <td>(sp),ix</td>
-<td>19</td>
+<td>23</td>
 </tr>
 <tr>
 <td>(sp),iy</td>
-<td>19</td>
+<td>23</td>
 </tr>
 </table>

org.efry.z80editor.ui/resources/z80opCodes/exx.html

@@ -1,4 +1,4 @@
-<p>EXX exchanges BC, DE, and HL with shadow registers with BC', DE', and HL'.</p>
+<p>EXX exchanges BC, DE, and HL with shadow registers BC', DE', and HL'.</p>
 <h2 id="toc0"><span>Syntax</span></h2>
 <div class="code">
 <pre>

org.efry.z80editor.ui/resources/z80opCodes/jr.html

@@ -2,14 +2,14 @@
 <h2 id="toc0"><span>Syntax</span></h2>
 <div class="code">
 <pre>
-<code>JP NN            ;unconditional jump
-JP cond.,NN        ;conditional jump</code>
+<code>JR NN            ;unconditional jump
+JR cond.,NN        ;conditional jump</code>
 </pre></div>
 <h3 id="toc1"><span>Allowed Instructions</span></h3>
 <div class="code">
 <pre>
 <code>;Constants
-JP NN        ;no contition
+JR NN        ;no contition
 JR C,NN        ;jumps if C is set
 JR NC,NN        ;jumps if C is reset
 JR Z,NN        ;jumps if Z is set
@@ -19,7 +19,7 @@ <h2 id="toc2"><span>Effects</span></h2>
 <p>All flags preserved.</p>
 <h2 id="toc3"><span>Uses</span></h2>
 <h2 id="toc4"><span>T-States</span></h2>
-<p>cc is condition: NZ, Z, NC, C, PO, PE, P, M<br /></p>
+<p>cc is condition: NZ, Z, NC, C<br /></p>
 <table class="wiki-content-table">
 <tr>
 <td>X</td>

org.efry.z80editor.ui/resources/z80opCodes/ld.html

@@ -735,7 +735,7 @@ <h2 id="toc0"><span>Syntax</span></h2>
 <th></th>
 <th></th>
 <th></th>
-<th></th>
+<td>x</td>
 <th></th>
 <th></th>
 </tr>
@@ -765,7 +765,7 @@ <h2 id="toc0"><span>Syntax</span></h2>
 <th></th>
 <th></th>
 <th></th>
-<th></th>
+<td>x</td>
 <th></th>
 <th></th>
 </tr>
@@ -801,16 +801,16 @@ <h2 id="toc0"><span>Syntax</span></h2>
 </tr>
 </table>
 <h2 id="toc1"><span>Effects</span></h2>
-<p>No flags are altered except in the cases of the I or R registers.</p>
+<p>No flags are altered except in the cases of loading the I or R registers into A.</p>
 <p>In those cases, C is preserved, H and N are reset, and alters Z and S. P/V is set if interrupts are enabled, reset otherwise.</p>
 <h2 id="toc2"><span>Uses</span></h2>
 <p>Use to load numbers into operands. They can either be numbers used in the code (usually 8-bits), or labels (usually 16-bits).</p>
 <div class="code">
 <pre>
-<code>ld b,$05    ;Counter
+<code>ld b,$05     ;Counter
 
 ld hl,var    ;Variable label
-ld a,(var)    ;Write data to var</code>
+ld (var),a   ;Write data to var</code>
 </pre></div>
 <h2 id="toc3"><span>T-States</span></h2>
 <p>r denotes 8-bit register.<br />
@@ -821,20 +821,20 @@ <h2 id="toc3"><span>T-States</span></h2>
 <td>4</td>
 </tr>
 <tr>
-<td>r,X</td>
+<td>r, X</td>
 <td>7</td>
 </tr>
 <tr>
-<td>r,(hl)</td>
+<td>r, (hl)</td>
 <td>7</td>
 </tr>
 <tr>
-<td>r,(ix+X)</td>
-<td>19</td>
+<td>(hl), r</td>
+<td>7</td>
 </tr>
 <tr>
-<td>r,(iy+X)</td>
-<td>19</td>
+<td>(hl), X</td>
+<td>10</td>
 </tr>
 <tr>
 <td>a, (bc)</td>
@@ -853,39 +853,15 @@ <h2 id="toc3"><span>T-States</span></h2>
 <td>7</td>
 </tr>
 <tr>
-<td>(de),a</td>
-<td>7</td>
-</tr>
-<tr>
-<td>(XX),a</td>
-<td>13</td>
-</tr>
-<tr>
-<td>a, i</td>
-<td>9</td>
-</tr>
-<tr>
-<td>a, r</td>
-<td>9</td>
-</tr>
-<tr>
-<td>i, a</td>
-<td>9</td>
-</tr>
-<tr>
-<td>r, a</td>
-<td>9</td>
-</tr>
-<tr>
-<td>a, (BC)</td>
+<td>(de), a</td>
 <td>7</td>
 </tr>
 <tr>
 <td>(XX), a</td>
 <td>13</td>
 </tr>
 <tr>
-<td>rr,XX</td>
+<td>rr, XX</td>
 <td>10</td>
 </tr>
 <tr>
@@ -898,7 +874,7 @@ <h2 id="toc3"><span>T-States</span></h2>
 </tr>
 <tr>
 <td>hl, (XX)</td>
-<td>20</td>
+<td>16</td>
 </tr>
 <tr>
 <td>ix, (XX)</td>
@@ -910,7 +886,7 @@ <h2 id="toc3"><span>T-States</span></h2>
 </tr>
 <tr>
 <td>(XX), hl</td>
-<td>20</td>
+<td>16</td>
 </tr>
 <tr>
 <td>(XX), rr</td>
@@ -925,6 +901,46 @@ <h2 id="toc3"><span>T-States</span></h2>
 <td>20</td>
 </tr>
 <tr>
+<td>r, (ix+X)</td>
+<td>19</td>
+</tr>
+<tr>
+<td>r, (iy+X)</td>
+<td>19</td>
+</tr>
+<tr>
+<td>(ix+X), r</td>
+<td>19</td>
+</tr>
+<tr>
+<td>(iy+X), r</td>
+<td>19</td>
+</tr>
+<tr>
+<td>(ix+X), X</td>
+<td>19</td>
+</tr>
+<tr>
+<td>(iy+X), X</td>
+<td>19</td>
+</tr>
+<tr>
+<td>a, I</td>
+<td>9</td>
+</tr>
+<tr>
+<td>a, R</td>
+<td>9</td>
+</tr>
+<tr>
+<td>I, a</td>
+<td>9</td>
+</tr>
+<tr>
+<td>R, a</td>
+<td>9</td>
+</tr>
+<tr>
 <td>sp, hl</td>
 <td>6</td>
 </tr>
@@ -936,4 +952,17 @@ <h2 id="toc3"><span>T-States</span></h2>
 <td>sp, iy</td>
 <td>10</td>
 </tr>
+<tr>
+<td>sp, XX</td>
+<td>10</td>
+</tr>
+<tr>
+<td>sp, (XX)</td>
+<td>20</td>
+</tr>
+<tr>
+<td>(XX), sp</td>
+<td>20</td>
+</tr>
 </table>
+

org.efry.z80editor.ui/resources/z80opCodes/rl.html

@@ -11,6 +11,7 @@ <h3 id="toc1"><span>Allowed Instructions</span></h3>
 RL B
 RL C
 RL D
+RL E
 RL H
 RL L
 RL (HL)