diff --git a/src/main/gen/de/platon42/intellij/plugins/m68k/lexer/_M68kLexer.java b/src/main/gen/de/platon42/intellij/plugins/m68k/lexer/_M68kLexer.java index eb1a8ca..d8fbbe7 100644 --- a/src/main/gen/de/platon42/intellij/plugins/m68k/lexer/_M68kLexer.java +++ b/src/main/gen/de/platon42/intellij/plugins/m68k/lexer/_M68kLexer.java @@ -134,55 +134,55 @@ public class _M68kLexer implements FlexLexer { /* The ZZ_CMAP_A table has 3200 entries */ static final char ZZ_CMAP_A[] = zzUnpackCMap( "\11\0\1\4\1\2\2\1\1\3\22\0\1\4\1\55\1\44\1\51\1\24\1\32\1\62\1\43\1\53\1\54" + - "\1\61\1\57\1\47\1\60\1\23\1\64\2\33\6\6\2\37\1\15\1\50\1\45\1\22\1\46\1\0" + - "\1\41\1\5\1\71\1\65\1\11\1\16\6\12\1\31\3\12\1\10\1\17\1\67\1\7\1\21\1\20" + - "\1\70\1\30\3\12\1\0\1\25\1\0\1\52\1\13\1\42\1\34\1\27\1\66\1\35\1\40\1\36" + - "\5\12\1\31\3\12\1\10\1\17\1\67\1\26\1\21\1\20\1\70\1\30\3\12\1\0\1\63\1\0" + - "\1\56\6\0\1\1\12\0\1\4\11\0\1\12\12\0\1\12\4\0\1\12\5\0\27\12\1\0\27\12\1" + - "\7\2\12\4\0\14\12\16\0\5\12\7\0\1\12\1\0\1\12\1\0\5\12\1\0\2\12\2\0\4\12\1" + - "\0\1\12\6\0\1\12\1\0\3\12\1\0\1\12\1\0\4\12\1\0\23\12\1\0\13\12\10\0\6\12" + - "\1\0\26\12\2\0\1\12\6\0\10\12\10\0\13\12\5\0\3\12\15\0\12\14\4\0\6\12\1\0" + - "\1\12\17\0\2\12\7\0\2\12\12\14\3\12\2\0\2\12\1\0\16\12\15\0\11\12\13\0\1\12" + - "\16\0\12\14\6\12\4\0\2\12\4\0\1\12\5\0\6\12\4\0\1\12\11\0\1\12\3\0\1\12\7" + - "\0\11\12\7\0\5\12\1\0\10\12\6\0\26\12\3\0\1\12\2\0\1\12\7\0\12\12\4\0\12\14" + - "\1\12\4\0\10\12\2\0\2\12\2\0\26\12\1\0\7\12\1\0\1\12\3\0\4\12\3\0\1\12\20" + - "\0\1\12\15\0\2\12\1\0\1\12\5\0\6\12\4\0\2\12\1\0\2\12\1\0\2\12\1\0\2\12\17" + - "\0\4\12\1\0\1\12\7\0\12\14\2\0\3\12\20\0\11\12\1\0\2\12\1\0\2\12\1\0\5\12" + - "\3\0\1\12\2\0\1\12\30\0\1\12\13\0\10\12\2\0\1\12\3\0\1\12\1\0\6\12\3\0\3\12" + - "\1\0\4\12\3\0\2\12\1\0\1\12\1\0\2\12\3\0\2\12\3\0\3\12\3\0\14\12\13\0\10\12" + - "\1\0\2\12\10\0\3\12\5\0\1\12\4\0\10\12\1\0\6\12\1\0\5\12\3\0\1\12\3\0\2\12" + - "\15\0\13\12\2\0\1\12\6\0\3\12\10\0\1\12\12\0\6\12\5\0\22\12\3\0\10\12\1\0" + - "\11\12\1\0\1\12\2\0\7\12\11\0\1\12\1\0\2\12\14\0\12\14\7\0\2\12\1\0\1\12\2" + - "\0\2\12\1\0\1\12\2\0\1\12\6\0\4\12\1\0\7\12\1\0\3\12\1\0\1\12\1\0\1\12\2\0" + - "\2\12\1\0\4\12\1\0\2\12\11\0\1\12\2\0\5\12\1\0\1\12\11\0\12\14\2\0\14\12\1" + - "\0\24\12\13\0\5\12\22\0\7\12\4\0\4\12\3\0\1\12\3\0\2\12\7\0\3\12\4\0\15\12" + - "\14\0\1\12\1\0\6\12\1\0\1\12\5\0\1\12\2\0\13\12\1\0\15\12\1\0\4\12\2\0\7\12" + - "\1\0\1\12\1\0\4\12\2\0\1\12\1\0\4\12\2\0\7\12\1\0\1\12\1\0\4\12\2\0\16\12" + - "\2\0\6\12\2\0\15\12\2\0\1\12\1\4\17\12\1\0\10\12\7\0\15\12\1\0\6\12\23\0\1" + - "\12\4\0\1\12\3\0\5\12\2\0\22\12\1\0\1\12\5\0\17\12\1\0\16\12\2\0\5\12\13\0" + - "\14\12\13\0\1\12\15\0\7\12\7\0\16\12\15\0\2\12\12\14\3\0\3\12\11\0\4\12\1" + - "\0\4\12\3\0\2\12\11\0\10\12\1\0\1\12\1\0\1\12\1\0\1\12\1\0\6\12\1\0\7\12\1" + - "\0\1\12\3\0\3\12\1\0\7\12\3\0\4\12\2\0\6\12\4\0\13\4\15\0\2\1\5\0\1\4\17\0" + - "\1\4\1\0\1\12\15\0\1\12\2\0\1\12\4\0\1\12\2\0\12\12\1\0\1\12\3\0\5\12\6\0" + - "\1\12\1\0\1\12\1\0\1\12\1\0\4\12\1\0\13\12\2\0\4\12\5\0\5\12\4\0\1\12\4\0" + - "\2\12\13\0\5\12\6\0\4\12\3\0\2\12\14\0\10\12\7\0\10\12\1\0\7\12\1\0\1\4\4" + - "\0\2\12\12\0\5\12\5\0\2\12\3\0\7\12\6\0\3\12\12\14\2\12\13\0\11\12\2\0\27" + - "\12\2\0\7\12\1\0\3\12\1\0\4\12\1\0\4\12\2\0\6\12\3\0\1\12\1\0\1\12\2\0\5\12" + - "\1\0\12\12\12\14\5\12\1\0\3\12\1\0\10\12\4\0\7\12\3\0\1\12\3\0\2\12\1\0\1" + - "\12\3\0\2\12\2\0\5\12\2\0\1\12\1\0\1\12\30\0\3\12\3\0\6\12\2\0\6\12\2\0\6" + - "\12\11\0\7\12\4\0\5\12\3\0\5\12\5\0\1\12\1\0\10\12\1\0\5\12\1\0\1\12\1\0\2" + - "\12\1\0\2\12\1\0\12\12\6\0\12\12\2\0\6\12\2\0\6\12\2\0\6\12\2\0\3\12\3\0\14" + - "\12\1\0\16\12\1\0\2\12\1\0\2\12\1\0\10\12\6\0\4\12\4\0\16\12\2\0\1\12\1\0" + - "\14\12\1\0\2\12\3\0\1\12\2\0\4\12\1\0\2\12\12\0\10\12\6\0\6\12\1\0\3\12\1" + - "\0\12\12\3\0\1\12\12\0\4\12\13\0\12\14\1\12\1\0\1\12\3\0\7\12\1\0\1\12\1\0" + - "\4\12\1\0\17\12\1\0\2\12\14\0\3\12\7\0\4\12\11\0\2\12\1\0\1\12\20\0\4\12\10" + - "\0\1\12\13\0\10\12\5\0\3\12\2\0\1\12\2\0\2\12\2\0\4\12\1\0\14\12\1\0\1\12" + - "\1\0\7\12\1\0\21\12\1\0\4\12\2\0\10\12\1\0\7\12\1\0\14\12\1\0\4\12\1\0\5\12" + - "\1\0\1\12\3\0\14\12\2\0\13\12\1\0\10\12\2\0\22\14\1\0\2\12\1\0\1\12\2\0\1" + - "\12\1\0\12\12\1\0\4\12\1\0\1\12\1\0\1\12\6\0\1\12\4\0\1\12\1\0\1\12\1\0\1" + - "\12\1\0\3\12\1\0\2\12\1\0\1\12\2\0\1\12\1\0\1\12\1\0\1\12\1\0\1\12\1\0\1\12" + - "\1\0\2\12\1\0\1\12\2\0\4\12\1\0\7\12\1\0\4\12\1\0\4\12\1\0\1\12\1\0\12\12" + - "\1\0\5\12\1\0\3\12\1\0\5\12\1\0\5\12"); + "\1\61\1\57\1\47\1\60\1\23\1\64\2\33\5\6\1\10\2\37\1\14\1\50\1\45\1\22\1\46" + + "\1\0\1\41\1\5\1\72\1\66\1\7\1\15\6\11\1\31\3\11\1\65\1\16\1\70\1\20\1\21\1" + + "\17\1\71\1\30\3\11\1\0\1\25\1\0\1\52\1\12\1\42\1\34\1\26\1\67\1\35\1\40\1" + + "\36\5\11\1\31\3\11\1\65\1\16\1\70\1\27\1\21\1\17\1\71\1\30\3\11\1\0\1\63\1" + + "\0\1\56\6\0\1\1\12\0\1\4\11\0\1\11\12\0\1\11\4\0\1\11\5\0\27\11\1\0\27\11" + + "\1\20\2\11\4\0\14\11\16\0\5\11\7\0\1\11\1\0\1\11\1\0\5\11\1\0\2\11\2\0\4\11" + + "\1\0\1\11\6\0\1\11\1\0\3\11\1\0\1\11\1\0\4\11\1\0\23\11\1\0\13\11\10\0\6\11" + + "\1\0\26\11\2\0\1\11\6\0\10\11\10\0\13\11\5\0\3\11\15\0\12\13\4\0\6\11\1\0" + + "\1\11\17\0\2\11\7\0\2\11\12\13\3\11\2\0\2\11\1\0\16\11\15\0\11\11\13\0\1\11" + + "\16\0\12\13\6\11\4\0\2\11\4\0\1\11\5\0\6\11\4\0\1\11\11\0\1\11\3\0\1\11\7" + + "\0\11\11\7\0\5\11\1\0\10\11\6\0\26\11\3\0\1\11\2\0\1\11\7\0\12\11\4\0\12\13" + + "\1\11\4\0\10\11\2\0\2\11\2\0\26\11\1\0\7\11\1\0\1\11\3\0\4\11\3\0\1\11\20" + + "\0\1\11\15\0\2\11\1\0\1\11\5\0\6\11\4\0\2\11\1\0\2\11\1\0\2\11\1\0\2\11\17" + + "\0\4\11\1\0\1\11\7\0\12\13\2\0\3\11\20\0\11\11\1\0\2\11\1\0\2\11\1\0\5\11" + + "\3\0\1\11\2\0\1\11\30\0\1\11\13\0\10\11\2\0\1\11\3\0\1\11\1\0\6\11\3\0\3\11" + + "\1\0\4\11\3\0\2\11\1\0\1\11\1\0\2\11\3\0\2\11\3\0\3\11\3\0\14\11\13\0\10\11" + + "\1\0\2\11\10\0\3\11\5\0\1\11\4\0\10\11\1\0\6\11\1\0\5\11\3\0\1\11\3\0\2\11" + + "\15\0\13\11\2\0\1\11\6\0\3\11\10\0\1\11\12\0\6\11\5\0\22\11\3\0\10\11\1\0" + + "\11\11\1\0\1\11\2\0\7\11\11\0\1\11\1\0\2\11\14\0\12\13\7\0\2\11\1\0\1\11\2" + + "\0\2\11\1\0\1\11\2\0\1\11\6\0\4\11\1\0\7\11\1\0\3\11\1\0\1\11\1\0\1\11\2\0" + + "\2\11\1\0\4\11\1\0\2\11\11\0\1\11\2\0\5\11\1\0\1\11\11\0\12\13\2\0\14\11\1" + + "\0\24\11\13\0\5\11\22\0\7\11\4\0\4\11\3\0\1\11\3\0\2\11\7\0\3\11\4\0\15\11" + + "\14\0\1\11\1\0\6\11\1\0\1\11\5\0\1\11\2\0\13\11\1\0\15\11\1\0\4\11\2\0\7\11" + + "\1\0\1\11\1\0\4\11\2\0\1\11\1\0\4\11\2\0\7\11\1\0\1\11\1\0\4\11\2\0\16\11" + + "\2\0\6\11\2\0\15\11\2\0\1\11\1\4\17\11\1\0\10\11\7\0\15\11\1\0\6\11\23\0\1" + + "\11\4\0\1\11\3\0\5\11\2\0\22\11\1\0\1\11\5\0\17\11\1\0\16\11\2\0\5\11\13\0" + + "\14\11\13\0\1\11\15\0\7\11\7\0\16\11\15\0\2\11\12\13\3\0\3\11\11\0\4\11\1" + + "\0\4\11\3\0\2\11\11\0\10\11\1\0\1\11\1\0\1\11\1\0\1\11\1\0\6\11\1\0\7\11\1" + + "\0\1\11\3\0\3\11\1\0\7\11\3\0\4\11\2\0\6\11\4\0\13\4\15\0\2\1\5\0\1\4\17\0" + + "\1\4\1\0\1\11\15\0\1\11\2\0\1\11\4\0\1\11\2\0\12\11\1\0\1\11\3\0\5\11\6\0" + + "\1\11\1\0\1\11\1\0\1\11\1\0\4\11\1\0\13\11\2\0\4\11\5\0\5\11\4\0\1\11\4\0" + + "\2\11\13\0\5\11\6\0\4\11\3\0\2\11\14\0\10\11\7\0\10\11\1\0\7\11\1\0\1\4\4" + + "\0\2\11\12\0\5\11\5\0\2\11\3\0\7\11\6\0\3\11\12\13\2\11\13\0\11\11\2\0\27" + + "\11\2\0\7\11\1\0\3\11\1\0\4\11\1\0\4\11\2\0\6\11\3\0\1\11\1\0\1\11\2\0\5\11" + + "\1\0\12\11\12\13\5\11\1\0\3\11\1\0\10\11\4\0\7\11\3\0\1\11\3\0\2\11\1\0\1" + + "\11\3\0\2\11\2\0\5\11\2\0\1\11\1\0\1\11\30\0\3\11\3\0\6\11\2\0\6\11\2\0\6" + + "\11\11\0\7\11\4\0\5\11\3\0\5\11\5\0\1\11\1\0\10\11\1\0\5\11\1\0\1\11\1\0\2" + + "\11\1\0\2\11\1\0\12\11\6\0\12\11\2\0\6\11\2\0\6\11\2\0\6\11\2\0\3\11\3\0\14" + + "\11\1\0\16\11\1\0\2\11\1\0\2\11\1\0\10\11\6\0\4\11\4\0\16\11\2\0\1\11\1\0" + + "\14\11\1\0\2\11\3\0\1\11\2\0\4\11\1\0\2\11\12\0\10\11\6\0\6\11\1\0\3\11\1" + + "\0\12\11\3\0\1\11\12\0\4\11\13\0\12\13\1\11\1\0\1\11\3\0\7\11\1\0\1\11\1\0" + + "\4\11\1\0\17\11\1\0\2\11\14\0\3\11\7\0\4\11\11\0\2\11\1\0\1\11\20\0\4\11\10" + + "\0\1\11\13\0\10\11\5\0\3\11\2\0\1\11\2\0\2\11\2\0\4\11\1\0\14\11\1\0\1\11" + + "\1\0\7\11\1\0\21\11\1\0\4\11\2\0\10\11\1\0\7\11\1\0\14\11\1\0\4\11\1\0\5\11" + + "\1\0\1\11\3\0\14\11\2\0\13\11\1\0\10\11\2\0\22\13\1\0\2\11\1\0\1\11\2\0\1" + + "\11\1\0\12\11\1\0\4\11\1\0\1\11\1\0\1\11\6\0\1\11\4\0\1\11\1\0\1\11\1\0\1" + + "\11\1\0\3\11\1\0\2\11\1\0\1\11\2\0\1\11\1\0\1\11\1\0\1\11\1\0\1\11\1\0\1\11" + + "\1\0\2\11\1\0\1\11\2\0\4\11\1\0\7\11\1\0\4\11\1\0\4\11\1\0\1\11\1\0\12\11" + + "\1\0\5\11\1\0\3\11\1\0\5\11\1\0\5\11"); /** * Translates DFA states to action switch labels. @@ -192,26 +192,26 @@ public class _M68kLexer implements FlexLexer { private static final String ZZ_ACTION_PACKED_0 = "\13\0\1\1\2\2\1\3\1\4\1\1\1\5\2\6" + "\1\2\1\7\1\10\1\1\1\11\2\12\1\7\1\10" + - "\1\13\1\14\1\15\1\1\1\16\1\17\1\20\5\17" + + "\1\13\1\14\1\15\1\1\1\16\1\17\1\20\4\17" + "\6\1\1\21\1\22\1\23\1\24\1\25\1\26\1\27" + - "\1\30\1\31\1\32\2\17\1\33\1\34\1\33\1\35" + + "\1\30\1\31\1\32\3\17\1\33\1\34\1\33\1\35" + "\1\36\1\37\1\40\1\41\1\42\1\43\1\44\1\45" + "\1\46\1\47\1\50\1\51\1\44\1\52\2\1\1\53" + "\1\54\1\55\6\1\1\56\1\57\1\60\1\61\1\62" + "\1\63\1\64\1\65\1\66\1\67\1\70\1\71\1\72" + "\1\73\1\74\1\67\1\75\1\76\1\12\4\76\1\5" + "\1\12\1\0\1\4\1\77\2\100\1\101\3\0\1\102" + - "\1\103\1\104\1\105\1\106\1\107\1\110\1\17\1\111" + - "\1\112\1\113\2\0\1\114\4\0\2\17\1\34\1\102" + - "\1\103\1\104\1\115\1\116\1\117\1\120\1\121\1\122" + - "\1\123\2\0\1\124\1\125\1\126\2\0\1\127\4\0" + - "\1\60\1\130\1\131\1\132\1\133\1\134\1\135\1\136" + - "\1\0\1\76\1\0\1\76\1\0\1\76\1\0\1\76" + - "\2\0\1\4\1\100\1\101\1\7\1\137\1\140\1\141" + - "\1\142\1\143\1\0\1\76\6\0"; + "\1\103\1\104\1\105\1\106\1\107\1\17\1\110\1\111" + + "\1\112\1\113\2\0\1\114\4\0\1\115\2\17\1\34" + + "\1\102\1\103\1\104\1\116\1\117\1\120\1\121\1\122" + + "\1\123\1\124\2\0\1\125\1\126\1\127\2\0\1\130" + + "\4\0\1\60\1\131\1\132\1\133\1\134\1\135\1\136" + + "\1\137\1\0\1\76\1\0\1\76\1\0\1\76\1\0" + + "\1\76\2\0\1\4\1\100\1\101\1\7\1\140\1\141" + + "\1\142\1\143\1\144\1\0\1\76\6\0"; private static int[] zzUnpackAction() { - int[] result = new int[200]; + int[] result = new int[201]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -236,34 +236,35 @@ public class _M68kLexer implements FlexLexer { private static final int[] ZZ_ROWMAP = zzUnpackRowMap(); private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\72\0\164\0\256\0\350\0\u0122\0\u015c\0\u0196" + - "\0\u01d0\0\u020a\0\u0244\0\u027e\0\u027e\0\u02b8\0\u02f2\0\u032c" + - "\0\u0366\0\u03a0\0\u027e\0\u03da\0\u0414\0\u044e\0\u0488\0\u04c2" + - "\0\u04fc\0\u027e\0\u0536\0\u0570\0\u05aa\0\u027e\0\u05e4\0\u061e" + - "\0\u0658\0\u0692\0\u06cc\0\u0706\0\u0740\0\u077a\0\u07b4\0\u07ee" + - "\0\u0828\0\u0862\0\u089c\0\u08d6\0\u0910\0\u094a\0\u0984\0\u027e" + - "\0\u027e\0\u027e\0\u027e\0\u027e\0\u027e\0\u027e\0\u027e\0\u027e" + - "\0\u027e\0\u09be\0\u09f8\0\u0a32\0\u0a6c\0\u0aa6\0\u027e\0\u0ae0" + - "\0\u0b1a\0\u027e\0\u027e\0\u027e\0\u027e\0\u0b54\0\u027e\0\u027e" + - "\0\u027e\0\u027e\0\u0b8e\0\u0bc8\0\u0c02\0\u0c3c\0\u0c76\0\u027e" + - "\0\u0cb0\0\u0cea\0\u0d24\0\u0d5e\0\u0d98\0\u0dd2\0\u0e0c\0\u0e46" + - "\0\u027e\0\u027e\0\u0e80\0\u027e\0\u0eba\0\u0ef4\0\u027e\0\u027e" + - "\0\u027e\0\u0f2e\0\u027e\0\u027e\0\u027e\0\u027e\0\u0f68\0\u0fa2" + - "\0\u0fdc\0\u1016\0\u1016\0\u1050\0\u108a\0\u10c4\0\u10fe\0\u1138" + - "\0\u1138\0\u1172\0\u11ac\0\u11e6\0\u1220\0\u125a\0\u1294\0\u12ce" + - "\0\u1308\0\u1342\0\u027e\0\u027e\0\u027e\0\u07ee\0\u07ee\0\u07ee" + - "\0\u07ee\0\u137c\0\u0862\0\u089c\0\u08d6\0\u0910\0\u13b6\0\u027e" + - "\0\u094a\0\u13f0\0\u0984\0\u142a\0\u1464\0\u149e\0\u027e\0\u0a32" + - "\0\u0a32\0\u0a32\0\u027e\0\u027e\0\u027e\0\u027e\0\u027e\0\u027e" + - "\0\u027e\0\u14d8\0\u1512\0\u0d24\0\u0d5e\0\u0d98\0\u0dd2\0\u154c" + - "\0\u027e\0\u0e0c\0\u1586\0\u0e46\0\u15c0\0\u027e\0\u027e\0\u027e" + - "\0\u027e\0\u027e\0\u027e\0\u027e\0\u027e\0\u15fa\0\u1634\0\u166e" + - "\0\u16a8\0\u16e2\0\u171c\0\u1756\0\u1790\0\u17ca\0\u1804\0\u027e" + - "\0\u027e\0\u027e\0\u027e\0\u027e\0\u07ee\0\u07ee\0\u07ee\0\u027e" + - "\0\u183e\0\u027e\0\u1878\0\u18b2\0\u18ec\0\u1926\0\u1960\0\u11e6"; + "\0\0\0\73\0\166\0\261\0\354\0\u0127\0\u0162\0\u019d" + + "\0\u01d8\0\u0213\0\u024e\0\u0289\0\u0289\0\u02c4\0\u02ff\0\u033a" + + "\0\u0375\0\u03b0\0\u0289\0\u03eb\0\u0426\0\u0461\0\u049c\0\u04d7" + + "\0\u0512\0\u0289\0\u054d\0\u0588\0\u05c3\0\u0289\0\u05fe\0\u0639" + + "\0\u0674\0\u06af\0\u06ea\0\u0725\0\u0760\0\u079b\0\u07d6\0\u0811" + + "\0\u084c\0\u0887\0\u08c2\0\u08fd\0\u0938\0\u0973\0\u0289\0\u0289" + + "\0\u0289\0\u0289\0\u0289\0\u0289\0\u0289\0\u0289\0\u0289\0\u0289" + + "\0\u09ae\0\u09e9\0\u0a24\0\u0a5f\0\u0a9a\0\u0ad5\0\u0289\0\u0b10" + + "\0\u0b4b\0\u0289\0\u0289\0\u0289\0\u0289\0\u0b86\0\u0289\0\u0289" + + "\0\u0289\0\u0289\0\u0bc1\0\u0bfc\0\u0c37\0\u0c72\0\u0cad\0\u0289" + + "\0\u0ce8\0\u0d23\0\u0d5e\0\u0d99\0\u0dd4\0\u0e0f\0\u0e4a\0\u0e85" + + "\0\u0289\0\u0289\0\u0ec0\0\u0289\0\u0efb\0\u0f36\0\u0289\0\u0289" + + "\0\u0289\0\u0f71\0\u0289\0\u0289\0\u0289\0\u0289\0\u0fac\0\u0fe7" + + "\0\u1022\0\u105d\0\u105d\0\u1098\0\u10d3\0\u110e\0\u1149\0\u1184" + + "\0\u1184\0\u11bf\0\u11fa\0\u1235\0\u1270\0\u12ab\0\u12e6\0\u1321" + + "\0\u135c\0\u1397\0\u0289\0\u0289\0\u0289\0\u079b\0\u079b\0\u079b" + + "\0\u13d2\0\u079b\0\u084c\0\u0887\0\u08c2\0\u08fd\0\u140d\0\u0289" + + "\0\u0938\0\u1448\0\u0973\0\u1483\0\u079b\0\u14be\0\u14f9\0\u0289" + + "\0\u0a5f\0\u0a5f\0\u0a5f\0\u0289\0\u0289\0\u0289\0\u0289\0\u0289" + + "\0\u0289\0\u0289\0\u1534\0\u156f\0\u0d5e\0\u0d99\0\u0dd4\0\u0e0f" + + "\0\u15aa\0\u0289\0\u0e4a\0\u15e5\0\u0e85\0\u1620\0\u0289\0\u0289" + + "\0\u0289\0\u0289\0\u0289\0\u0289\0\u0289\0\u0289\0\u165b\0\u1696" + + "\0\u16d1\0\u170c\0\u1747\0\u1782\0\u17bd\0\u17f8\0\u1833\0\u186e" + + "\0\u0289\0\u0289\0\u0289\0\u0289\0\u0289\0\u079b\0\u079b\0\u079b" + + "\0\u0289\0\u18a9\0\u0289\0\u18e4\0\u191f\0\u195a\0\u1995\0\u19d0" + + "\0\u1235"; private static int[] zzUnpackRowMap() { - int[] result = new int[200]; + int[] result = new int[201]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -286,123 +287,127 @@ public class _M68kLexer implements FlexLexer { private static final int[] ZZ_TRANS = zzUnpackTrans(); private static final String ZZ_TRANS_PACKED_0 = - "\1\14\2\15\1\16\1\17\1\20\1\14\5\20\2\14" + - "\4\20\1\14\1\21\2\14\4\20\2\14\3\20\1\14" + - "\1\20\7\14\2\22\7\14\1\22\3\14\5\20\1\14" + - "\2\23\1\24\1\25\1\26\1\14\4\26\1\27\2\14" + - "\4\26\1\14\1\30\2\14\4\26\2\14\3\26\1\14" + - "\1\26\7\14\2\31\7\14\1\31\3\14\5\26\1\14" + - "\2\32\1\33\1\25\1\34\1\14\4\34\1\35\1\14" + - "\1\36\4\34\4\14\4\34\2\14\3\34\1\14\1\34" + - "\7\14\1\37\14\14\5\34\1\14\2\32\1\33\1\40" + - "\16\14\1\41\24\14\1\37\22\14\2\32\1\33\1\42" + - "\1\43\1\44\1\45\1\46\1\47\2\50\2\14\2\50" + - "\1\51\1\50\1\14\1\50\1\52\1\14\1\45\3\50" + - "\1\53\1\44\1\43\1\47\1\50\1\44\1\50\1\54" + - "\1\55\1\56\1\57\2\14\1\60\1\37\1\61\1\62" + - "\1\63\1\64\1\65\1\66\1\67\1\70\1\71\3\14" + - "\2\72\1\50\1\73\1\50\1\14\2\32\1\33\1\42" + - "\1\74\1\14\5\74\2\14\4\74\1\75\1\76\2\14" + - "\4\74\1\77\1\14\3\74\1\14\1\74\4\14\1\100" + - "\1\101\1\102\1\37\1\14\1\103\1\104\1\105\1\106" + - "\1\107\1\110\1\111\1\112\1\113\1\114\1\115\5\74" + - "\1\14\2\32\1\33\1\25\2\14\1\116\5\14\1\36" + - "\1\117\3\14\1\120\3\14\1\116\11\14\1\117\7\14" + - "\1\37\22\14\2\32\1\33\1\42\1\121\1\122\5\121" + - "\2\14\4\121\1\14\1\121\1\123\1\14\4\121\1\124" + - "\1\122\3\121\1\122\1\121\1\125\1\126\1\127\1\130" + - "\2\14\1\60\1\37\1\14\1\62\1\63\1\131\1\65" + - "\1\66\1\67\1\70\1\132\3\14\5\121\1\14\2\32" + - "\1\33\1\42\15\14\1\133\7\14\1\134\12\14\1\135" + - "\1\136\1\137\1\37\1\14\1\140\1\141\1\105\1\142" + - "\1\143\1\144\1\145\1\146\1\147\1\150\1\151\5\14" + - "\1\152\1\153\1\32\1\33\1\42\35\152\1\154\1\155" + - "\1\156\1\157\1\152\1\60\1\37\21\152\1\160\1\161" + - "\1\32\1\33\66\160\74\0\1\15\73\0\1\17\71\0" + - "\1\162\10\20\1\163\4\20\1\164\1\0\1\165\1\0" + - "\4\20\1\0\6\20\24\0\5\20\5\0\1\166\1\0" + - "\5\166\2\0\4\166\4\0\4\166\2\0\3\166\1\0" + - "\1\166\24\0\5\166\1\22\3\0\66\22\2\0\1\23" + - "\73\0\1\25\72\0\1\26\1\27\4\26\2\27\1\167" + - "\4\26\1\0\1\170\1\171\1\0\4\26\1\0\1\27" + - "\3\26\1\27\1\26\24\0\5\26\5\0\10\27\1\167" + - "\4\27\2\0\1\171\1\0\4\27\1\0\6\27\24\0" + - "\5\27\5\0\1\172\1\0\5\172\2\0\4\172\4\0" + - "\4\172\2\0\3\172\1\0\1\172\24\0\5\172\1\31" + - "\3\0\66\31\2\0\1\32\74\0\1\34\1\35\4\34" + - "\2\35\1\0\4\34\1\0\1\170\2\0\4\34\1\0" + - "\1\35\3\34\1\35\1\34\24\0\5\34\5\0\10\35" + - "\1\0\4\35\4\0\4\35\1\0\6\35\24\0\5\35" + - "\1\37\3\0\66\37\4\0\1\40\113\0\2\173\1\174" + - "\1\175\44\0\1\42\72\0\1\50\1\176\6\50\1\0" + - "\4\50\2\0\1\50\1\0\4\50\1\0\1\176\5\50" + - "\24\0\5\50\6\0\1\44\24\0\1\44\3\0\1\44" + - "\37\0\3\50\1\176\4\50\1\0\4\50\2\0\1\50" + - "\1\0\4\50\1\0\6\50\24\0\2\50\1\177\2\50" + - "\5\0\10\50\1\0\4\50\2\0\1\50\1\0\4\50" + - "\1\0\6\50\24\0\2\200\3\50\5\0\1\50\1\201" + - "\6\50\1\0\4\50\2\0\1\50\1\0\4\50\1\0" + - "\1\201\5\50\24\0\5\50\5\0\10\50\1\0\4\50" + - "\2\0\1\50\1\0\4\50\1\0\6\50\24\0\5\50" + - "\5\0\2\50\1\202\5\50\1\0\4\50\2\0\1\50" + - "\1\0\1\202\3\50\1\0\6\50\24\0\5\50\6\0" + - "\1\203\20\0\1\203\3\0\6\203\25\0\1\203\36\0" + - "\1\204\44\0\1\205\24\0\1\205\36\0\2\206\2\0" + - "\21\206\1\207\14\206\1\210\27\206\2\211\2\0\21\211" + - "\1\212\15\211\1\210\26\211\2\213\2\0\21\213\1\214" + - "\16\213\1\210\25\213\5\0\10\50\1\0\4\50\2\0" + - "\1\50\1\0\4\50\1\0\6\50\24\0\2\215\3\50" + - "\5\0\10\50\1\0\4\50\2\0\1\50\1\0\1\50" + - "\1\216\2\50\1\0\6\50\24\0\4\50\1\216\5\0" + - "\10\74\1\0\4\74\2\0\1\74\1\0\4\74\1\0" + - "\6\74\24\0\5\74\22\0\1\217\54\0\10\74\1\0" + - "\4\74\2\0\1\74\1\0\2\220\1\221\1\222\1\0" + - "\6\74\24\0\5\74\22\0\1\223\22\0\1\224\1\225" + - "\45\0\1\226\23\0\1\227\45\0\1\225\131\0\1\230" + - "\72\0\1\231\72\0\1\77\23\0\1\232\21\0\1\232" + - "\50\0\1\233\57\0\10\121\1\0\4\121\1\0\7\121" + - "\1\0\6\121\24\0\5\121\6\0\1\122\24\0\1\122" + - "\3\0\1\122\40\0\1\234\20\0\1\234\3\0\6\234" + - "\25\0\1\234\36\0\1\235\44\0\1\236\24\0\1\236" + - "\36\0\2\237\2\0\21\237\1\240\14\237\1\241\27\237" + - "\2\242\2\0\21\242\1\243\15\242\1\241\26\242\2\244" + - "\2\0\21\244\1\245\16\244\1\241\25\244\22\0\1\246" + - "\71\0\1\247\22\0\1\250\1\251\45\0\1\252\23\0" + - "\1\253\45\0\1\251\131\0\1\254\72\0\1\255\72\0" + - "\1\134\5\0\2\152\3\0\42\152\2\0\21\152\2\154" + - "\2\0\1\256\20\154\1\257\14\154\1\152\4\154\2\256" + - "\21\154\2\155\2\0\1\260\20\155\1\261\15\155\1\152" + - "\3\155\2\260\21\155\2\156\2\0\1\262\20\156\1\263" + - "\16\156\1\152\2\156\2\262\21\156\2\157\2\0\1\264" + - "\20\157\1\265\20\157\1\152\2\264\21\157\2\160\2\0" + - "\66\160\4\0\1\162\2\0\1\266\6\0\1\267\3\0" + - "\1\164\3\0\1\266\11\0\1\267\35\0\1\162\10\0" + - "\1\270\4\0\1\164\53\0\1\164\102\0\1\271\61\0" + - "\10\166\1\271\4\166\4\0\4\166\1\0\6\166\24\0" + - "\5\166\15\0\1\272\54\0\1\273\3\0\66\273\15\0" + - "\1\274\61\0\10\172\1\274\4\172\4\0\4\172\1\0" + - "\6\172\24\0\5\172\5\0\3\50\1\275\4\50\1\0" + - "\4\50\2\0\1\50\1\0\4\50\1\0\6\50\24\0" + - "\5\50\1\206\3\0\66\206\1\211\3\0\66\211\1\213" + - "\3\0\66\213\5\0\10\50\1\0\4\50\2\0\1\50" + - "\1\0\4\50\1\0\6\50\24\0\2\50\1\276\2\50" + - "\5\0\10\50\1\0\4\50\2\0\1\50\1\0\4\50" + - "\1\0\6\50\24\0\2\50\1\277\2\50\21\0\1\300" + - "\70\0\1\300\51\0\1\237\3\0\66\237\1\242\3\0" + - "\66\242\1\244\3\0\66\244\2\256\2\0\21\256\1\301" + - "\14\256\1\302\27\256\1\154\1\152\2\0\1\256\42\154" + - "\2\256\21\154\2\260\2\0\21\260\1\303\15\260\1\302" + - "\26\260\1\155\1\152\2\0\1\260\42\155\2\260\21\155" + - "\2\262\2\0\21\262\1\304\16\262\1\302\25\262\1\156" + - "\1\152\2\0\1\262\42\156\2\262\21\156\2\264\2\0" + - "\21\264\1\305\20\264\1\302\23\264\1\157\1\152\2\0" + - "\1\264\42\157\2\264\21\157\16\0\1\306\21\0\1\306" + - "\50\0\1\307\52\0\1\256\3\0\66\256\1\260\3\0" + - "\66\260\1\262\3\0\66\262\1\264\3\0\66\264\21\0" + - "\1\310\70\0\1\310\51\0"; + "\1\14\2\15\1\16\1\17\1\20\1\14\1\20\1\14" + + "\2\20\2\14\5\20\1\14\1\21\2\14\4\20\2\14" + + "\3\20\1\14\1\20\7\14\2\22\7\14\1\22\3\14" + + "\6\20\1\14\2\23\1\24\1\25\1\26\1\14\1\26" + + "\1\14\1\26\1\27\2\14\5\26\1\14\1\30\2\14" + + "\4\26\2\14\3\26\1\14\1\26\7\14\2\31\7\14" + + "\1\31\3\14\6\26\1\14\2\32\1\33\1\25\1\34" + + "\1\14\1\34\1\14\1\34\1\35\1\14\1\36\5\34" + + "\4\14\4\34\2\14\3\34\1\14\1\34\7\14\1\37" + + "\14\14\6\34\1\14\2\32\1\33\1\40\16\14\1\41" + + "\24\14\1\37\23\14\2\32\1\33\1\42\1\43\1\44" + + "\1\45\1\44\2\46\2\14\2\46\1\47\1\50\1\46" + + "\1\14\1\46\1\51\1\14\1\46\1\50\2\46\1\52" + + "\1\44\1\43\1\45\1\46\1\44\1\46\1\53\1\54" + + "\1\55\1\56\2\14\1\57\1\37\1\60\1\61\1\62" + + "\1\63\1\64\1\65\1\66\1\67\1\70\3\14\1\71" + + "\2\72\1\46\1\73\1\46\1\14\2\32\1\33\1\42" + + "\1\74\1\14\1\74\1\14\2\74\2\14\5\74\1\75" + + "\1\76\2\14\4\74\1\77\1\14\3\74\1\14\1\74" + + "\4\14\1\100\1\101\1\102\1\37\1\14\1\103\1\104" + + "\1\105\1\106\1\107\1\110\1\111\1\112\1\113\1\114" + + "\1\115\6\74\1\14\2\32\1\33\1\25\7\14\1\36" + + "\1\116\2\14\1\117\1\14\1\120\4\14\1\117\10\14" + + "\1\116\7\14\1\37\23\14\2\32\1\33\1\42\1\121" + + "\1\122\1\121\1\122\2\121\2\14\5\121\1\14\1\121" + + "\1\123\1\14\4\121\1\124\1\122\3\121\1\122\1\121" + + "\1\125\1\126\1\127\1\130\2\14\1\57\1\37\1\14" + + "\1\61\1\62\1\131\1\64\1\65\1\66\1\67\1\132" + + "\3\14\6\121\1\14\2\32\1\33\1\42\15\14\1\133" + + "\7\14\1\134\12\14\1\135\1\136\1\137\1\37\1\14" + + "\1\140\1\141\1\105\1\142\1\143\1\144\1\145\1\146" + + "\1\147\1\150\1\151\6\14\1\152\1\153\1\32\1\33" + + "\1\42\35\152\1\154\1\155\1\156\1\157\1\152\1\57" + + "\1\37\22\152\1\160\1\161\1\32\1\33\67\160\75\0" + + "\1\15\74\0\1\17\72\0\1\162\7\20\1\163\5\20" + + "\1\164\1\0\1\165\1\0\4\20\1\0\6\20\24\0" + + "\6\20\5\0\1\166\1\0\1\166\1\0\2\166\2\0" + + "\5\166\4\0\4\166\2\0\3\166\1\0\1\166\24\0" + + "\6\166\1\22\3\0\67\22\2\0\1\23\74\0\1\25" + + "\73\0\1\26\1\27\1\26\1\27\1\26\2\27\1\167" + + "\5\26\1\0\1\170\1\171\1\0\4\26\1\0\1\27" + + "\3\26\1\27\1\26\24\0\6\26\5\0\7\27\1\167" + + "\5\27\2\0\1\171\1\0\4\27\1\0\6\27\24\0" + + "\6\27\5\0\1\172\1\0\1\172\1\0\2\172\2\0" + + "\5\172\4\0\4\172\2\0\3\172\1\0\1\172\24\0" + + "\6\172\1\31\3\0\67\31\2\0\1\32\75\0\1\34" + + "\1\35\1\34\1\35\1\34\2\35\1\0\5\34\1\0" + + "\1\170\2\0\4\34\1\0\1\35\3\34\1\35\1\34" + + "\24\0\6\34\5\0\7\35\1\0\5\35\4\0\4\35" + + "\1\0\6\35\24\0\6\35\1\37\3\0\67\37\4\0" + + "\1\40\114\0\2\173\1\174\1\175\45\0\1\42\73\0" + + "\1\46\1\176\1\46\1\177\3\46\1\0\5\46\2\0" + + "\1\46\1\0\4\46\1\0\1\176\5\46\24\0\6\46" + + "\6\0\1\44\1\0\1\44\22\0\1\44\3\0\1\44" + + "\40\0\1\46\1\200\1\46\1\200\3\46\1\0\5\46" + + "\2\0\1\46\1\0\4\46\1\0\1\200\5\46\24\0" + + "\6\46\5\0\7\46\1\0\5\46\2\0\1\46\1\0" + + "\4\46\1\0\6\46\24\0\6\46\5\0\7\46\1\0" + + "\3\46\1\201\1\46\2\0\1\46\1\0\1\46\1\201" + + "\2\46\1\0\6\46\24\0\6\46\5\0\7\46\1\0" + + "\5\46\2\0\1\46\1\0\4\46\1\0\6\46\24\0" + + "\1\177\2\46\1\202\2\46\6\0\1\203\1\0\1\203" + + "\15\0\1\203\4\0\6\203\26\0\1\203\36\0\1\204" + + "\45\0\1\205\1\0\1\205\22\0\1\205\37\0\2\206" + + "\2\0\21\206\1\207\14\206\1\210\30\206\2\211\2\0" + + "\21\211\1\212\15\211\1\210\27\211\2\213\2\0\21\213" + + "\1\214\16\213\1\210\26\213\5\0\7\46\1\0\5\46" + + "\2\0\1\46\1\0\4\46\1\0\6\46\24\0\1\46" + + "\2\215\3\46\5\0\7\46\1\0\5\46\2\0\1\46" + + "\1\0\4\46\1\0\6\46\24\0\1\46\2\216\3\46" + + "\5\0\7\46\1\0\5\46\2\0\1\46\1\0\1\217" + + "\3\46\1\0\6\46\24\0\5\46\1\217\5\0\7\74" + + "\1\0\5\74\2\0\1\74\1\0\4\74\1\0\6\74" + + "\24\0\6\74\22\0\1\220\55\0\7\74\1\0\5\74" + + "\2\0\1\74\1\0\2\221\1\222\1\223\1\0\6\74" + + "\24\0\6\74\22\0\1\224\22\0\1\225\1\226\46\0" + + "\1\227\23\0\1\230\46\0\1\226\132\0\1\231\73\0" + + "\1\232\73\0\1\77\24\0\1\233\71\0\1\234\22\0" + + "\1\234\37\0\7\121\1\0\5\121\1\0\7\121\1\0" + + "\6\121\24\0\6\121\6\0\1\122\1\0\1\122\22\0" + + "\1\122\3\0\1\122\41\0\1\235\1\0\1\235\15\0" + + "\1\235\4\0\6\235\26\0\1\235\36\0\1\236\45\0" + + "\1\237\1\0\1\237\22\0\1\237\37\0\2\240\2\0" + + "\21\240\1\241\14\240\1\242\30\240\2\243\2\0\21\243" + + "\1\244\15\243\1\242\27\243\2\245\2\0\21\245\1\246" + + "\16\245\1\242\26\245\22\0\1\247\72\0\1\250\22\0" + + "\1\251\1\252\46\0\1\253\23\0\1\254\46\0\1\252" + + "\132\0\1\255\73\0\1\256\73\0\1\134\6\0\2\152" + + "\3\0\42\152\2\0\22\152\2\154\2\0\1\257\20\154" + + "\1\260\14\154\1\152\4\154\2\257\22\154\2\155\2\0" + + "\1\261\20\155\1\262\15\155\1\152\3\155\2\261\22\155" + + "\2\156\2\0\1\263\20\156\1\264\16\156\1\152\2\156" + + "\2\263\22\156\2\157\2\0\1\265\20\157\1\266\20\157" + + "\1\152\2\265\22\157\2\160\2\0\67\160\4\0\1\162" + + "\10\0\1\267\2\0\1\270\1\0\1\164\4\0\1\270" + + "\10\0\1\267\36\0\1\162\7\0\1\271\5\0\1\164" + + "\54\0\1\164\102\0\1\272\63\0\7\166\1\272\5\166" + + "\4\0\4\166\1\0\6\166\24\0\6\166\14\0\1\273" + + "\56\0\1\274\3\0\67\274\14\0\1\275\63\0\7\172" + + "\1\275\5\172\4\0\4\172\1\0\6\172\24\0\6\172" + + "\5\0\7\46\1\0\5\46\2\0\1\46\1\0\4\46" + + "\1\0\6\46\24\0\1\276\5\46\1\206\3\0\67\206" + + "\1\211\3\0\67\211\1\213\3\0\67\213\5\0\7\46" + + "\1\0\5\46\2\0\1\46\1\0\4\46\1\0\6\46" + + "\24\0\3\46\1\277\2\46\5\0\7\46\1\0\5\46" + + "\2\0\1\46\1\0\4\46\1\0\6\46\24\0\3\46" + + "\1\300\2\46\17\0\1\301\74\0\1\301\51\0\1\240" + + "\3\0\67\240\1\243\3\0\67\243\1\245\3\0\67\245" + + "\2\257\2\0\21\257\1\302\14\257\1\303\30\257\1\154" + + "\1\152\2\0\1\257\42\154\2\257\22\154\2\261\2\0" + + "\21\261\1\304\15\261\1\303\27\261\1\155\1\152\2\0" + + "\1\261\42\155\2\261\22\155\2\263\2\0\21\263\1\305" + + "\16\263\1\303\26\263\1\156\1\152\2\0\1\263\42\156" + + "\2\263\22\156\2\265\2\0\21\265\1\306\20\265\1\303" + + "\24\265\1\157\1\152\2\0\1\265\42\157\2\265\22\157" + + "\16\0\1\307\71\0\1\310\22\0\1\310\32\0\1\257" + + "\3\0\67\257\1\261\3\0\67\261\1\263\3\0\67\263" + + "\1\265\3\0\67\265\17\0\1\311\74\0\1\311\51\0"; private static int[] zzUnpackTrans() { - int[] result = new int[6554]; + int[] result = new int[6667]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -441,16 +446,16 @@ public class _M68kLexer implements FlexLexer { private static final String ZZ_ATTRIBUTE_PACKED_0 = "\13\0\2\11\5\1\1\11\6\1\1\11\3\1\1\11" + - "\21\1\12\11\5\1\1\11\2\1\4\11\1\1\4\11" + + "\20\1\12\11\6\1\1\11\2\1\4\11\1\1\4\11" + "\5\1\1\11\10\1\2\11\1\1\1\11\2\1\3\11" + "\1\1\4\11\13\1\1\0\5\1\3\0\3\11\10\1" + - "\2\0\1\11\4\0\2\1\1\11\3\1\7\11\2\0" + + "\2\0\1\11\4\0\3\1\1\11\3\1\7\11\2\0" + "\3\1\2\0\1\11\4\0\10\11\1\0\1\1\1\0" + "\1\1\1\0\1\1\1\0\1\1\2\0\5\11\3\1" + "\1\11\1\0\1\11\6\0"; private static int[] zzUnpackAttribute() { - int[] result = new int[200]; + int[] result = new int[201]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -781,13 +786,13 @@ public class _M68kLexer implements FlexLexer { return BAD_CHARACTER; } // fall through - case 100: + case 101: break; case 2: { return WHITE_SPACE; } // fall through - case 101: + case 102: break; case 3: { yybegin(NOSOL); @@ -795,7 +800,7 @@ public class _M68kLexer implements FlexLexer { return WHITE_SPACE; } // fall through - case 102: + case 103: break; case 4: { yybegin(INSTRPART); @@ -804,20 +809,20 @@ public class _M68kLexer implements FlexLexer { return GLOBAL_LABEL_DEF; } // fall through - case 103: + case 104: break; case 5: { return COMMENT; } // fall through - case 104: + case 105: break; case 6: { yybegin(YYINITIAL); return WHITE_SPACE; } // fall through - case 105: + case 106: break; case 7: { if (isAsmMnemonicWithSize(yytext())) { @@ -842,7 +847,7 @@ public class _M68kLexer implements FlexLexer { return MACRO_INVOKATION; } // fall through - case 106: + case 107: break; case 8: { yybegin(MACROCALL); @@ -850,372 +855,372 @@ public class _M68kLexer implements FlexLexer { return MACRO_INVOKATION; } // fall through - case 107: + case 108: break; case 9: { yybegin(YYINITIAL); return COMMENT; } // fall through - case 108: + case 109: break; case 10: { yybegin(YYINITIAL); return EOL; } // fall through - case 109: + case 110: break; case 11: { return COLON; } // fall through - case 110: + case 111: break; case 12: { yybegin(WAITEOL); return COMMENT; } // fall through - case 111: + case 112: break; case 13: { yybegin(ASMOPS); return WHITE_SPACE; } // fall through - case 112: + case 113: break; case 14: { return handleEolCommentWhitespace(this); } // fall through - case 113: + case 114: break; case 15: { yybegin(ASMOPS_OP); return SYMBOL; } // fall through - case 114: + case 115: break; case 16: { yybegin(ASMOPS_OP); return DECIMAL; } // fall through - case 115: + case 116: break; case 17: { return SEPARATOR; } // fall through - case 116: + case 117: break; case 18: { return HASH; } // fall through - case 117: + case 118: break; case 19: { return OP_BITWISE_XOR; } // fall through - case 118: + case 119: break; case 20: { return ROUND_L; } // fall through - case 119: + case 120: break; case 21: { yybegin(ASMOPS_OP); return ROUND_R; } // fall through - case 120: + case 121: break; case 22: { return OP_UNARY_NOT; } // fall through - case 121: + case 122: break; case 23: { return OP_UNARY_COMPL; } // fall through - case 122: + case 123: break; case 24: { return OP_PLUS; } // fall through - case 123: + case 124: break; case 25: { return OP_MINUS; } // fall through - case 124: + case 125: break; case 26: { yybegin(ASMOPS_OP); return CURRENT_PC_SYMBOL; } // fall through - case 125: + case 126: break; case 27: { return SYMBOL; } // fall through - case 126: + case 127: break; case 28: { yybegin(ASMOPS); return OP_CMP_EQ; } // fall through - case 127: + case 128: break; case 29: { yybegin(ASMOPS); return OP_AR_MOD; } // fall through - case 128: + case 129: break; case 30: { yybegin(ASMOPS); return OP_CMP_LT; } // fall through - case 129: + case 130: break; case 31: { yybegin(ASMOPS); return OP_CMP_GT; } // fall through - case 130: + case 131: break; case 32: { yybegin(ASMOPS); return SEPARATOR; } // fall through - case 131: + case 132: break; case 33: { yybegin(ASMOPS); return OP_BITWISE_XOR; } // fall through - case 132: + case 133: break; case 34: { yybegin(ASMOPS); return ROUND_L; } // fall through - case 133: + case 134: break; case 35: { return ROUND_R; } // fall through - case 134: + case 135: break; case 36: { yybegin(ASMOPS); return OP_BITWISE_OR; } // fall through - case 135: + case 136: break; case 37: { yybegin(ASMOPS); return OP_UNARY_COMPL; } // fall through - case 136: + case 137: break; case 38: { yybegin(ASMOPS); return OP_PLUS; } // fall through - case 137: + case 138: break; case 39: { yybegin(ASMOPS); return OP_MINUS; } // fall through - case 138: + case 139: break; case 40: { yybegin(ASMOPS); return OP_AR_MUL; } // fall through - case 139: + case 140: break; case 41: { yybegin(ASMOPS); return OP_BITWISE_AND; } // fall through - case 140: + case 141: break; case 42: { yybegin(ASMOPS); return OP_AR_DIV; } // fall through - case 141: + case 142: break; case 43: { yybegin(EXPR); return OP_ASSIGN; } // fall through - case 142: + case 143: break; case 44: { yybegin(EXPR_OP); return SYMBOL; } // fall through - case 143: + case 144: break; case 45: { yybegin(EXPR_OP); return DECIMAL; } // fall through - case 144: + case 145: break; case 46: { yybegin(EXPR_OP); return ROUND_R; } // fall through - case 145: + case 146: break; case 47: { yybegin(EXPR_OP); return CURRENT_PC_SYMBOL; } // fall through - case 146: + case 147: break; case 48: { yybegin(EXPR); return OP_CMP_EQ; } // fall through - case 147: + case 148: break; case 49: { yybegin(EXPR); return OP_AR_MOD; } // fall through - case 148: + case 149: break; case 50: { yybegin(EXPR); return OP_CMP_LT; } // fall through - case 149: + case 150: break; case 51: { yybegin(EXPR); return OP_CMP_GT; } // fall through - case 150: + case 151: break; case 52: { yybegin(EXPR); return SEPARATOR; } // fall through - case 151: + case 152: break; case 53: { yybegin(EXPR); return OP_BITWISE_XOR; } // fall through - case 152: + case 153: break; case 54: { yybegin(EXPR); return ROUND_L; } // fall through - case 153: + case 154: break; case 55: { yybegin(EXPR); return OP_BITWISE_OR; } // fall through - case 154: + case 155: break; case 56: { yybegin(EXPR); return OP_UNARY_COMPL; } // fall through - case 155: + case 156: break; case 57: { yybegin(EXPR); return OP_PLUS; } // fall through - case 156: + case 157: break; case 58: { yybegin(EXPR); return OP_MINUS; } // fall through - case 157: + case 158: break; case 59: { yybegin(EXPR); return OP_AR_MUL; } // fall through - case 158: + case 159: break; case 60: { yybegin(EXPR); return OP_BITWISE_AND; } // fall through - case 159: + case 160: break; case 61: { yybegin(EXPR); return OP_AR_DIV; } // fall through - case 160: + case 161: break; case 62: { return STRINGLIT; } // fall through - case 161: + case 162: break; case 63: { yybegin(ASSIGNMENT); @@ -1224,7 +1229,7 @@ public class _M68kLexer implements FlexLexer { return SYMBOLDEF; } // fall through - case 162: + case 163: break; case 64: { yybegin(INSTRPART); @@ -1233,7 +1238,7 @@ public class _M68kLexer implements FlexLexer { return LOCAL_LABEL_DEF; } // fall through - case 163: + case 164: break; case 65: { yybegin(INSTRPART); @@ -1241,243 +1246,250 @@ public class _M68kLexer implements FlexLexer { return GLOBAL_LABEL_DEF; } // fall through - case 164: + case 165: break; case 66: { return OPSIZE_BS; } // fall through - case 165: + case 166: break; case 67: { return OPSIZE_W; } // fall through - case 166: + case 167: break; case 68: { return OPSIZE_L; } // fall through - case 167: + case 168: break; case 69: { yybegin(ASMOPS_OP); return AREG; } // fall through - case 168: + case 169: break; case 70: { yybegin(ASMOPS_OP); - return REG_SR; - } - // fall through - case 169: - break; - case 71: { - yybegin(ASMOPS_OP); - return PC; + return REG_SP; } // fall through case 170: break; - case 72: { + case 71: { yybegin(ASMOPS_OP); return DREG; } // fall through case 171: break; + case 72: { + yybegin(ASMOPS_OP); + return REG_SR; + } + // fall through + case 172: + break; case 73: { yybegin(ASMOPS_OP); return HEXADECIMAL; } // fall through - case 172: + case 173: break; case 74: { yybegin(ASMOPS_OP); return BINARY; } // fall through - case 173: + case 174: break; case 75: { yybegin(ASMOPS_OP); return OCTAL; } // fall through - case 174: + case 175: break; case 76: { yybegin(ASMOPS_OP); return STRINGLIT; } // fall through - case 175: - break; - case 77: { - yybegin(ASMOPS); - return OP_CMP_LT_EQ; - } - // fall through case 176: break; - case 78: { - yybegin(ASMOPS); - return OP_AR_SHIFT_L; + case 77: { + yybegin(ASMOPS_OP); + return PC; } // fall through case 177: break; - case 79: { + case 78: { yybegin(ASMOPS); - return OP_CMP_NOT_EQ; + return OP_CMP_LT_EQ; } // fall through case 178: break; - case 80: { + case 79: { yybegin(ASMOPS); - return OP_CMP_GT_EQ; + return OP_AR_SHIFT_L; } // fall through case 179: break; - case 81: { + case 80: { yybegin(ASMOPS); - return OP_AR_SHIFT_R; + return OP_CMP_NOT_EQ; } // fall through case 180: break; - case 82: { + case 81: { yybegin(ASMOPS); - return OP_LOGICAL_AND; + return OP_CMP_GT_EQ; } // fall through case 181: break; - case 83: { + case 82: { yybegin(ASMOPS); - return OP_LOGICAL_OR; + return OP_AR_SHIFT_R; } // fall through case 182: break; - case 84: { - yybegin(EXPR_OP); - return HEXADECIMAL; + case 83: { + yybegin(ASMOPS); + return OP_LOGICAL_AND; } // fall through case 183: break; - case 85: { - yybegin(EXPR_OP); - return BINARY; + case 84: { + yybegin(ASMOPS); + return OP_LOGICAL_OR; } // fall through case 184: break; - case 86: { + case 85: { yybegin(EXPR_OP); - return OCTAL; + return HEXADECIMAL; } // fall through case 185: break; - case 87: { + case 86: { yybegin(EXPR_OP); - return STRINGLIT; + return BINARY; } // fall through case 186: break; - case 88: { - yybegin(EXPR); - return OP_CMP_LT_EQ; + case 87: { + yybegin(EXPR_OP); + return OCTAL; } // fall through case 187: break; - case 89: { - yybegin(EXPR); - return OP_AR_SHIFT_L; + case 88: { + yybegin(EXPR_OP); + return STRINGLIT; } // fall through case 188: break; - case 90: { + case 89: { yybegin(EXPR); - return OP_CMP_NOT_EQ; + return OP_CMP_LT_EQ; } // fall through case 189: break; - case 91: { + case 90: { yybegin(EXPR); - return OP_CMP_GT_EQ; + return OP_AR_SHIFT_L; } // fall through case 190: break; - case 92: { + case 91: { yybegin(EXPR); - return OP_AR_SHIFT_R; + return OP_CMP_NOT_EQ; } // fall through case 191: break; - case 93: { + case 92: { yybegin(EXPR); - return OP_LOGICAL_AND; + return OP_CMP_GT_EQ; } // fall through case 192: break; - case 94: { + case 93: { yybegin(EXPR); - return OP_LOGICAL_OR; + return OP_AR_SHIFT_R; } // fall through case 193: break; + case 94: { + yybegin(EXPR); + return OP_LOGICAL_AND; + } + // fall through + case 194: + break; case 95: { + yybegin(EXPR); + return OP_LOGICAL_OR; + } + // fall through + case 195: + break; + case 96: { yybegin(INSTRPART); yypushback(pushbackLabelColons(yytext())); return LOCAL_LABEL_DEF; } // fall through - case 194: + case 196: break; - case 96: { + case 97: { yybegin(ASMOPS_OP); return REG_USP; } // fall through - case 195: + case 197: break; - case 97: { + case 98: { yybegin(ASMOPS_OP); return REG_CCR; } // fall through - case 196: + case 198: break; - case 98: { + case 99: { yybegin(ASMOPS_OP); return REG_VBR; } // fall through - case 197: + case 199: break; - case 99: { + case 100: { yybegin(EXPR); return EQU; } // fall through - case 198: + case 200: break; default: zzScanError(ZZ_NO_MATCH); diff --git a/src/main/gen/de/platon42/intellij/plugins/m68k/parser/M68kParser.java b/src/main/gen/de/platon42/intellij/plugins/m68k/parser/M68kParser.java index 7503922..b74597a 100644 --- a/src/main/gen/de/platon42/intellij/plugins/m68k/parser/M68kParser.java +++ b/src/main/gen/de/platon42/intellij/plugins/m68k/parser/M68kParser.java @@ -84,13 +84,14 @@ public class M68kParser implements PsiParser, LightPsiParser { } /* ********************************************************** */ - // AREG + // AREG | REG_SP public static boolean AddressRegister(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "AddressRegister")) return false; - if (!nextTokenIs(b, "
", AREG)) return false; + if (!nextTokenIs(b, "
", AREG, REG_SP)) return false; boolean r; Marker m = enter_section_(b, l, _NONE_, ADDRESS_REGISTER, "
"); r = consumeToken(b, AREG); + if (!r) r = consumeToken(b, REG_SP); exit_section_(b, l, m, r, false, null); return r; } @@ -99,7 +100,7 @@ public class M68kParser implements PsiParser, LightPsiParser { // AddressRegister !(OP_MINUS|OP_AR_DIV) public static boolean AddressRegisterDirectAddressingMode(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "AddressRegisterDirectAddressingMode")) return false; - if (!nextTokenIsFast(b, AREG)) return false; + if (!nextTokenIsFast(b, AREG, REG_SP)) return false; boolean r; Marker m = enter_section_(b, l, _NONE_, ADDRESS_REGISTER_DIRECT_ADDRESSING_MODE, ""); r = AddressRegister(b, l + 1); @@ -445,7 +446,6 @@ public class M68kParser implements PsiParser, LightPsiParser { // DataRegister | AddressRegister static boolean DataOrAddressRegister(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "DataOrAddressRegister")) return false; - if (!nextTokenIs(b, "", AREG, DREG)) return false; boolean r; Marker m = enter_section_(b, l, _NONE_, null, ""); r = DataRegister(b, l + 1); @@ -931,7 +931,6 @@ public class M68kParser implements PsiParser, LightPsiParser { // (DataOrAddressRegister|RegisterRange) ((OP_AR_DIV|OP_MINUS) (DataOrAddressRegister|RegisterRange))* public static boolean RegisterListAddressingMode(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "RegisterListAddressingMode")) return false; - if (!nextTokenIsFast(b, AREG, DREG)) return false; boolean r; Marker m = enter_section_(b, l, _NONE_, REGISTER_LIST_ADDRESSING_MODE, ""); r = RegisterListAddressingMode_0(b, l + 1); @@ -993,7 +992,6 @@ public class M68kParser implements PsiParser, LightPsiParser { // DataOrAddressRegister OP_MINUS DataOrAddressRegister static boolean RegisterRange(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "RegisterRange")) return false; - if (!nextTokenIs(b, "", AREG, DREG)) return false; boolean r; Marker m = enter_section_(b); r = DataOrAddressRegister(b, l + 1); diff --git a/src/main/gen/de/platon42/intellij/plugins/m68k/psi/M68kTypes.java b/src/main/gen/de/platon42/intellij/plugins/m68k/psi/M68kTypes.java index d72218b..c595573 100644 --- a/src/main/gen/de/platon42/intellij/plugins/m68k/psi/M68kTypes.java +++ b/src/main/gen/de/platon42/intellij/plugins/m68k/psi/M68kTypes.java @@ -116,6 +116,7 @@ public interface M68kTypes { IElementType OTHER_DIRECTIVE = new M68kTokenType("OTHER_DIRECTIVE"); IElementType PC = new M68kTokenType("PC"); IElementType REG_CCR = new M68kTokenType("REG_CCR"); + IElementType REG_SP = new M68kTokenType("REG_SP"); IElementType REG_SR = new M68kTokenType("REG_SR"); IElementType REG_USP = new M68kTokenType("REG_USP"); IElementType REG_VBR = new M68kTokenType("REG_VBR"); diff --git a/src/main/java/de/platon42/intellij/plugins/m68k/lexer/_M68kLexer.flex b/src/main/java/de/platon42/intellij/plugins/m68k/lexer/_M68kLexer.flex index 741c3cc..e554651 100644 --- a/src/main/java/de/platon42/intellij/plugins/m68k/lexer/_M68kLexer.flex +++ b/src/main/java/de/platon42/intellij/plugins/m68k/lexer/_M68kLexer.flex @@ -35,7 +35,7 @@ import static de.platon42.intellij.plugins.m68k.lexer.LexerUtil.*; EOL=\R WHITE_SPACE=\p{Blank}+ -AREG=((a[0-7])|sp) +AREG=(a[0-6]) DREG=(d[0-7]) ASSIGNMENT=(([:letter:]|_)(([:letter:]|[:digit:])|_)*:?((\p{Blank}+equ\p{Blank}+)|(\p{Blank}+set\p{Blank}+)|\p{Blank}*=\p{Blank}*)) LOCAL_LABEL=(\.([:letter:]|_)(([:letter:]|[:digit:])|_)*:?)|(([:letter:]|_)(([:letter:]|[:digit:])|_)*\$:?) @@ -216,6 +216,7 @@ SKIP_TO_EOL=[^\r\n]+ {AREG} { yybegin(ASMOPS_OP); return AREG; } {DREG} { yybegin(ASMOPS_OP); return DREG; } + "sp"|"a7" { yybegin(ASMOPS_OP); return REG_SP; } "pc" { yybegin(ASMOPS_OP); return PC; } "ccr" { yybegin(ASMOPS_OP); return REG_CCR; } "sr" { yybegin(ASMOPS_OP); return REG_SR; } diff --git a/src/main/java/de/platon42/intellij/plugins/m68k/m68k.bnf b/src/main/java/de/platon42/intellij/plugins/m68k/m68k.bnf index 8e48ce7..3ceb32b 100644 --- a/src/main/java/de/platon42/intellij/plugins/m68k/m68k.bnf +++ b/src/main/java/de/platon42/intellij/plugins/m68k/m68k.bnf @@ -195,7 +195,7 @@ DataRegister ::= DREG { extends = Register } -AddressRegister ::= AREG { +AddressRegister ::= AREG | REG_SP { name = "address register" extends = Register } diff --git a/src/main/java/de/platon42/intellij/plugins/m68k/syntax/M68kColorSettingsPage.kt b/src/main/java/de/platon42/intellij/plugins/m68k/syntax/M68kColorSettingsPage.kt index f5569cc..b74b098 100644 --- a/src/main/java/de/platon42/intellij/plugins/m68k/syntax/M68kColorSettingsPage.kt +++ b/src/main/java/de/platon42/intellij/plugins/m68k/syntax/M68kColorSettingsPage.kt @@ -25,6 +25,7 @@ import de.platon42.intellij.plugins.m68k.syntax.M68kSyntaxHighlighter.Companion. import de.platon42.intellij.plugins.m68k.syntax.M68kSyntaxHighlighter.Companion.PROGRAM_COUNTER import de.platon42.intellij.plugins.m68k.syntax.M68kSyntaxHighlighter.Companion.SEPARATOR import de.platon42.intellij.plugins.m68k.syntax.M68kSyntaxHighlighter.Companion.SPECIAL_REG +import de.platon42.intellij.plugins.m68k.syntax.M68kSyntaxHighlighter.Companion.STACK_POINTER import de.platon42.intellij.plugins.m68k.syntax.M68kSyntaxHighlighter.Companion.STRING import de.platon42.intellij.plugins.m68k.syntax.M68kSyntaxHighlighter.Companion.SYMBOLDEF import de.platon42.intellij.plugins.m68k.syntax.M68kSyntaxHighlighter.Companion.SYMBOLREF @@ -65,6 +66,12 @@ demo_init ; global label POPM .skip rts +irq: move.l a0,-(sp) + move usp,a0 + move.l a0,$400.w + move.l (sp)+,a0 + rte + hello: dc.b 'Hello World!',10,0 even dc.w *-hello ; length of string @@ -97,17 +104,18 @@ hello: dc.b 'Hello World!',10,0 AttributesDescriptor("Symbol reference", SYMBOLREF), AttributesDescriptor("Assembly mnemonic", MNEMONIC), AttributesDescriptor("Macro invocation", MACRO_CALL), - AttributesDescriptor("Byte/short data width", DATA_WIDTH_BS), - AttributesDescriptor("Word data width", DATA_WIDTH_W), - AttributesDescriptor("Long data width", DATA_WIDTH_L), + AttributesDescriptor("Data width: Byte/short", DATA_WIDTH_BS), + AttributesDescriptor("Data width: Word", DATA_WIDTH_W), + AttributesDescriptor("Data width: Long", DATA_WIDTH_L), AttributesDescriptor("Data preprocessor directives", DATA_PREPROCESSOR), AttributesDescriptor("Other preprocessor directives", OTHER_PREPROCESSOR), AttributesDescriptor("Strings", STRING), AttributesDescriptor("Numbers", NUMBER), - AttributesDescriptor("Address registers", AREG), - AttributesDescriptor("Data registers", DREG), - AttributesDescriptor("Program counter", PROGRAM_COUNTER), - AttributesDescriptor("Special registers", SPECIAL_REG), + AttributesDescriptor("Registers: Address registers", AREG), + AttributesDescriptor("Registers: Stack pointer", STACK_POINTER), + AttributesDescriptor("Registers: Data registers", DREG), + AttributesDescriptor("Registers: Program counter", PROGRAM_COUNTER), + AttributesDescriptor("Registers: Special registers", SPECIAL_REG), AttributesDescriptor("Comments", COMMENT), AttributesDescriptor("Bad characters", BAD_CHARACTER) ) diff --git a/src/main/java/de/platon42/intellij/plugins/m68k/syntax/M68kSyntaxHighlighter.kt b/src/main/java/de/platon42/intellij/plugins/m68k/syntax/M68kSyntaxHighlighter.kt index 00f789b..fab466d 100644 --- a/src/main/java/de/platon42/intellij/plugins/m68k/syntax/M68kSyntaxHighlighter.kt +++ b/src/main/java/de/platon42/intellij/plugins/m68k/syntax/M68kSyntaxHighlighter.kt @@ -39,6 +39,7 @@ class M68kSyntaxHighlighter(val project: Project?) : SyntaxHighlighterBase() { M68kTypes.OPSIZE_W -> arrayOf(DATA_WIDTH_W) M68kTypes.OPSIZE_L -> arrayOf(DATA_WIDTH_L) M68kTypes.AREG -> arrayOf(AREG) + M68kTypes.REG_SP -> arrayOf(STACK_POINTER) M68kTypes.DREG -> arrayOf(DREG) M68kTypes.REG_USP, M68kTypes.REG_SR, M68kTypes.REG_CCR, M68kTypes.REG_VBR -> arrayOf(SPECIAL_REG) M68kTypes.COMMENT -> arrayOf(COMMENT) @@ -66,6 +67,7 @@ class M68kSyntaxHighlighter(val project: Project?) : SyntaxHighlighterBase() { val STRING = TextAttributesKey.createTextAttributesKey("MC68000_STRING", DefaultLanguageHighlighterColors.STRING) val NUMBER = TextAttributesKey.createTextAttributesKey("MC68000_NUMBER", DefaultLanguageHighlighterColors.NUMBER) val AREG = TextAttributesKey.createTextAttributesKey("MC68000_AREG", DefaultLanguageHighlighterColors.PARAMETER) + val STACK_POINTER = TextAttributesKey.createTextAttributesKey("MC68000_SP", DefaultLanguageHighlighterColors.PARAMETER) val DREG = TextAttributesKey.createTextAttributesKey("MC68000_DREG", DefaultLanguageHighlighterColors.PARAMETER) val SPECIAL_REG = TextAttributesKey.createTextAttributesKey("MC68000_SPECIALREG", DefaultLanguageHighlighterColors.PARAMETER) val PROGRAM_COUNTER = TextAttributesKey.createTextAttributesKey("MC68000_PROGRAM_COUNTER", DefaultLanguageHighlighterColors.PARAMETER) diff --git a/src/test/resources/parser/addressingmodes/movem_register_list.txt b/src/test/resources/parser/addressingmodes/movem_register_list.txt index d4801ed..23a9ecc 100644 --- a/src/test/resources/parser/addressingmodes/movem_register_list.txt +++ b/src/test/resources/parser/addressingmodes/movem_register_list.txt @@ -30,6 +30,6 @@ Assembly File: a.asm PsiElement(M68kTokenType.OP_MINUS)('-') PsiElement(M68kTokenType.ROUND_L)('(') M68kAddressRegisterImpl(ADDRESS_REGISTER) - PsiElement(M68kTokenType.AREG)('sp') + PsiElement(M68kTokenType.REG_SP)('sp') PsiElement(M68kTokenType.ROUND_R)(')') PsiElement(M68kTokenType.EOL)('\n') \ No newline at end of file diff --git a/src/test/resources/parser/addressingmodes/register_direct.txt b/src/test/resources/parser/addressingmodes/register_direct.txt index 2012de4..6fb81e9 100644 --- a/src/test/resources/parser/addressingmodes/register_direct.txt +++ b/src/test/resources/parser/addressingmodes/register_direct.txt @@ -13,5 +13,5 @@ Assembly File: a.asm PsiElement(M68kTokenType.SEPARATOR)(',') M68kAddressRegisterDirectAddressingModeImpl(ADDRESS_REGISTER_DIRECT_ADDRESSING_MODE) M68kAddressRegisterImpl(ADDRESS_REGISTER) - PsiElement(M68kTokenType.AREG)('a7') + PsiElement(M68kTokenType.REG_SP)('a7') PsiElement(M68kTokenType.EOL)('\n') \ No newline at end of file diff --git a/src/test/resources/parser/addressingmodes/register_indirect.txt b/src/test/resources/parser/addressingmodes/register_indirect.txt index 2dd647c..779eb39 100644 --- a/src/test/resources/parser/addressingmodes/register_indirect.txt +++ b/src/test/resources/parser/addressingmodes/register_indirect.txt @@ -10,7 +10,7 @@ Assembly File: a.asm M68kAddressRegisterIndirectAddressingModeImpl(ADDRESS_REGISTER_INDIRECT_ADDRESSING_MODE) PsiElement(M68kTokenType.ROUND_L)('(') M68kAddressRegisterImpl(ADDRESS_REGISTER) - PsiElement(M68kTokenType.AREG)('sp') + PsiElement(M68kTokenType.REG_SP)('sp') PsiElement(M68kTokenType.ROUND_R)(')') PsiElement(M68kTokenType.SEPARATOR)(',') M68kAddressRegisterIndirectAddressingModeImpl(ADDRESS_REGISTER_INDIRECT_ADDRESSING_MODE) diff --git a/src/test/resources/parser/addressingmodes/register_indirect_predecrement_postincrement.txt b/src/test/resources/parser/addressingmodes/register_indirect_predecrement_postincrement.txt index 60ad332..e63afe9 100644 --- a/src/test/resources/parser/addressingmodes/register_indirect_predecrement_postincrement.txt +++ b/src/test/resources/parser/addressingmodes/register_indirect_predecrement_postincrement.txt @@ -18,6 +18,6 @@ Assembly File: a.asm PsiElement(M68kTokenType.OP_MINUS)('-') PsiElement(M68kTokenType.ROUND_L)('(') M68kAddressRegisterImpl(ADDRESS_REGISTER) - PsiElement(M68kTokenType.AREG)('sp') + PsiElement(M68kTokenType.REG_SP)('sp') PsiElement(M68kTokenType.ROUND_R)(')') PsiElement(M68kTokenType.EOL)('\n') \ No newline at end of file diff --git a/src/test/resources/parser/addressingmodes/register_indirect_with_index_and_offset_new_syntax.txt b/src/test/resources/parser/addressingmodes/register_indirect_with_index_and_offset_new_syntax.txt index 017939f..dddf1f8 100644 --- a/src/test/resources/parser/addressingmodes/register_indirect_with_index_and_offset_new_syntax.txt +++ b/src/test/resources/parser/addressingmodes/register_indirect_with_index_and_offset_new_syntax.txt @@ -20,7 +20,7 @@ Assembly File: a.asm PsiElement(M68kTokenType.SYMBOL)('foo') PsiElement(M68kTokenType.SEPARATOR)(',') M68kAddressRegisterImpl(ADDRESS_REGISTER) - PsiElement(M68kTokenType.AREG)('sp') + PsiElement(M68kTokenType.REG_SP)('sp') PsiElement(M68kTokenType.SEPARATOR)(',') M68kAddressRegisterImpl(ADDRESS_REGISTER) PsiElement(M68kTokenType.AREG)('a0') diff --git a/src/test/resources/parser/addressingmodes/register_indirect_with_index_and_offset_old_syntax.txt b/src/test/resources/parser/addressingmodes/register_indirect_with_index_and_offset_old_syntax.txt index 9133df2..a5f4069 100644 --- a/src/test/resources/parser/addressingmodes/register_indirect_with_index_and_offset_old_syntax.txt +++ b/src/test/resources/parser/addressingmodes/register_indirect_with_index_and_offset_old_syntax.txt @@ -19,7 +19,7 @@ Assembly File: a.asm PsiElement(M68kTokenType.SYMBOL)('foo') PsiElement(M68kTokenType.ROUND_L)('(') M68kAddressRegisterImpl(ADDRESS_REGISTER) - PsiElement(M68kTokenType.AREG)('sp') + PsiElement(M68kTokenType.REG_SP)('sp') PsiElement(M68kTokenType.SEPARATOR)(',') M68kDataRegisterImpl(DATA_REGISTER) PsiElement(M68kTokenType.DREG)('d0') diff --git a/src/test/resources/parser/addressingmodes/register_indirect_with_index_special_case_without_offset.txt b/src/test/resources/parser/addressingmodes/register_indirect_with_index_special_case_without_offset.txt index 3bcbfe7..9c0c73d 100644 --- a/src/test/resources/parser/addressingmodes/register_indirect_with_index_special_case_without_offset.txt +++ b/src/test/resources/parser/addressingmodes/register_indirect_with_index_special_case_without_offset.txt @@ -10,7 +10,7 @@ Assembly File: a.asm M68kAddressRegisterIndirectWithIndexNewAddressingModeImpl(ADDRESS_REGISTER_INDIRECT_WITH_INDEX_NEW_ADDRESSING_MODE) PsiElement(M68kTokenType.ROUND_L)('(') M68kAddressRegisterImpl(ADDRESS_REGISTER) - PsiElement(M68kTokenType.AREG)('sp') + PsiElement(M68kTokenType.REG_SP)('sp') PsiElement(M68kTokenType.SEPARATOR)(',') M68kDataRegisterImpl(DATA_REGISTER) PsiElement(M68kTokenType.DREG)('d0') diff --git a/src/test/resources/parser/addressingmodes/register_indirect_with_offset_new_syntax.txt b/src/test/resources/parser/addressingmodes/register_indirect_with_offset_new_syntax.txt index 4ebe77b..b12287b 100644 --- a/src/test/resources/parser/addressingmodes/register_indirect_with_offset_new_syntax.txt +++ b/src/test/resources/parser/addressingmodes/register_indirect_with_offset_new_syntax.txt @@ -20,7 +20,7 @@ Assembly File: a.asm PsiElement(M68kTokenType.SYMBOL)('foo') PsiElement(M68kTokenType.SEPARATOR)(',') M68kAddressRegisterImpl(ADDRESS_REGISTER) - PsiElement(M68kTokenType.AREG)('sp') + PsiElement(M68kTokenType.REG_SP)('sp') PsiElement(M68kTokenType.ROUND_R)(')') PsiElement(M68kTokenType.SEPARATOR)(',') M68kAddressRegisterIndirectWithDisplacementNewAddressingModeImpl(ADDRESS_REGISTER_INDIRECT_WITH_DISPLACEMENT_NEW_ADDRESSING_MODE) diff --git a/src/test/resources/parser/addressingmodes/register_indirect_with_offset_old_syntax.txt b/src/test/resources/parser/addressingmodes/register_indirect_with_offset_old_syntax.txt index 2999ab7..b2de87e 100644 --- a/src/test/resources/parser/addressingmodes/register_indirect_with_offset_old_syntax.txt +++ b/src/test/resources/parser/addressingmodes/register_indirect_with_offset_old_syntax.txt @@ -19,7 +19,7 @@ Assembly File: a.asm PsiElement(M68kTokenType.SYMBOL)('foo') PsiElement(M68kTokenType.ROUND_L)('(') M68kAddressRegisterImpl(ADDRESS_REGISTER) - PsiElement(M68kTokenType.AREG)('sp') + PsiElement(M68kTokenType.REG_SP)('sp') PsiElement(M68kTokenType.ROUND_R)(')') PsiElement(M68kTokenType.SEPARATOR)(',') M68kAddressRegisterIndirectWithDisplacementOldAddressingModeImpl(ADDRESS_REGISTER_INDIRECT_WITH_DISPLACEMENT_OLD_ADDRESSING_MODE)