From 650e65cdd5ae91ff78a15203bc41f84f4de23a8a Mon Sep 17 00:00:00 2001
From: emteere <47253321+emteere@users.noreply.github.com>
Date: Wed, 24 Feb 2021 20:56:09 +0000
Subject: [PATCH] GP-721_emteere added new define token endian attribute. 
 Added Ghidra category on built plugin extension so it appears when users
 install

---
 .../ghidra.xtext.sleigh.feature/category.xml                | 6 +++---
 .../ghidra.xtext.sleigh.feature/feature.xml                 | 2 +-
 .../ghidra.xtext.sleigh.ide/META-INF/MANIFEST.MF            | 2 +-
 .../ghidra.xtext.sleigh.ui.tests/META-INF/MANIFEST.MF       | 3 ++-
 .../ghidra.xtext.sleigh.ui/META-INF/MANIFEST.MF             | 2 +-
 .../ghidra.xtext.sleigh/META-INF/MANIFEST.MF                | 2 +-
 .../GhidraSleighEditor/ghidra.xtext.sleigh/plugin.xml       | 6 +++++-
 .../src/ghidra/xtext/sleigh/Sleigh.xtext                    | 3 ++-
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.feature/category.xml b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.feature/category.xml
index 21b6add2a1..5c9a401995 100644
--- a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.feature/category.xml
+++ b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.feature/category.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/ghidra.xtext.sleigh.feature_1.0.0.qualifier.jar" id="ghidra.xtext.sleigh.feature" version="1.0.0.qualifier">
-      <category name="ghidra.xtext.sleigh.editor"/>
+   <feature id="ghidra.xtext.sleigh.feature">
+      <category name="GhidraCategory"/>
    </feature>
-   <category-def name="ghidra.xtext.sleigh.editor" label="Ghidra"/>
+   <category-def name="GhidraCategory" label="Ghidra"/>
 </site>
diff --git a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.feature/feature.xml b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.feature/feature.xml
index 65831c9255..16ffc71a33 100644
--- a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.feature/feature.xml
+++ b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="ghidra.xtext.sleigh.feature"
       label="Ghidra Sleigh Editor"
-      version="1.0.0.qualifier"
+      version="1.0.1.qualifier"
       provider-name="Ghidra">
 
    <copyright>
diff --git a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ide/META-INF/MANIFEST.MF b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ide/META-INF/MANIFEST.MF
index fffdce6b63..7760ce9751 100644
--- a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ide/META-INF/MANIFEST.MF
+++ b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: ghidra.xtext.sleigh.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: ghidra.xtext.sleigh.ide
 Bundle-Vendor: Ghidra
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
 Bundle-SymbolicName: ghidra.xtext.sleigh.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: ghidra.xtext.sleigh,
diff --git a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ui.tests/META-INF/MANIFEST.MF b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ui.tests/META-INF/MANIFEST.MF
index 94627e204e..d050e0d5b7 100644
--- a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ui.tests/META-INF/MANIFEST.MF
+++ b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ui.tests/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: ghidra.xtext.sleigh.ui,
  org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit,
  org.eclipse.core.runtime,
- org.eclipse.ui.workbench;resolution:=optional
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: ghidra.xtext.sleigh.ui.tests;x-internal=true
diff --git a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ui/META-INF/MANIFEST.MF b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ui/META-INF/MANIFEST.MF
index 075e0e71af..7d5b41fd0d 100644
--- a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ui/META-INF/MANIFEST.MF
+++ b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: ghidra.xtext.sleigh.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: ghidra.xtext.sleigh.ui
 Bundle-Vendor: Ghidra
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
 Bundle-SymbolicName: ghidra.xtext.sleigh.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: ghidra.xtext.sleigh,
diff --git a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/META-INF/MANIFEST.MF b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/META-INF/MANIFEST.MF
index c982b203b5..4fa4632222 100644
--- a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/META-INF/MANIFEST.MF
+++ b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: ghidra.xtext.sleigh
 Bundle-ManifestVersion: 2
 Bundle-Name: ghidra.xtext.sleigh
 Bundle-Vendor: Ghidra
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
 Bundle-SymbolicName: ghidra.xtext.sleigh; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,
diff --git a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/plugin.xml b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/plugin.xml
index 26c699fb0e..242ae876f4 100644
--- a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/plugin.xml
+++ b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/plugin.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.4"?>
 <plugin>
 	<extension point="org.eclipse.emf.ecore.generated_package">
+		<category
+            id="GhidraCategory"
+            name="Ghidra">
+        </category>
 		<package 
 			uri = "http://www.xtext.ghidra/sleigh/Sleigh"
 			class = "ghidra.xtext.sleigh.sleigh.SleighPackage"
diff --git a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/src/ghidra/xtext/sleigh/Sleigh.xtext b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/src/ghidra/xtext/sleigh/Sleigh.xtext
index 3b7deffd51..ed7bf29e7f 100644
--- a/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/src/ghidra/xtext/sleigh/Sleigh.xtext
+++ b/GhidraBuild/EclipsePlugins/GhidraSleighEditor/ghidra.xtext.sleigh/src/ghidra/xtext/sleigh/Sleigh.xtext
@@ -98,8 +98,9 @@ aligndef :
 ;
 
 tokendef :
-	'define' 'token' ID '(' size=integerValue ')' fields=tokenprop ';' // {}
+	'define' 'token' ID '(' size=integerValue ')' ( 'endian' '=' (is_big?='big' | is_little?='little' ))?  fields=tokenprop ';' // {}
 ;
+
 //
 tokenprop:
 	 tokens+=(