Merge remote-tracking branch 'origin/GP-721_emteere_SleighEditorTokenEndian' into patch

This commit is contained in:
ghidra1 2021-02-25 19:13:52 -05:00
commit 7b8e6b4471
8 changed files with 16 additions and 10 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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,

View File

@ -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

View File

@ -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,

View File

@ -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,

View File

@ -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"

View File

@ -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+=(