Added support for SCALE in index addressing modes.

2021-10-08 08:37:29 +02:00
parent 9b93ea05fc
commit 7462c5b02d
16 changed files with 253 additions and 12 deletions
@@ -52,6 +52,16 @@ internal class AddressingModesTest : AbstractParsingTest() {
        testGoodSyntax(testCase, " move.l (sp,d0.w),(a1,a3)\n")
    }

+    @Test
+    internal fun register_indirect_with_scaled_index_and_offset_old_syntax(@MyTestCase testCase: ParsingTestExtension.IParsingTestCase) {
+        testGoodSyntax(testCase, " move.l -4+foo(sp,d0.w*8),(10*20+4)(a1,a3*4)\n")
+    }
+
+    @Test
+    internal fun register_indirect_with_scaled_index_and_offset_new_syntax(@MyTestCase testCase: ParsingTestExtension.IParsingTestCase) {
+        testGoodSyntax(testCase, " move.l (-4+foo,sp,a0*1),((10*20+4),a1,d5.l*2)\n")
+    }
+
    @Test
    internal fun pc_indirect_with_offset_old_syntax(@MyTestCase testCase: ParsingTestExtension.IParsingTestCase) {
        testGoodSyntax(testCase, " move.l -4*4(pc),+4(pc)\n")
@@ -0,0 +1,63 @@
+Assembly File: a.asm
+  PsiWhiteSpace(' ')
+  M68kStatementImpl(STATEMENT)
+    M68kAsmInstructionImpl(ASM_INSTRUCTION)
+      M68kAsmOpImpl(ASM_OP)
+        PsiElement(M68kTokenType.MNEMONIC)('move')
+        M68kOperandSizeImpl(OPERAND_SIZE)
+          PsiElement(M68kTokenType.OPSIZE_L)('.l')
+      PsiWhiteSpace(' ')
+      M68kAddressRegisterIndirectWithIndexNewAddressingModeImpl(ADDRESS_REGISTER_INDIRECT_WITH_INDEX_NEW_ADDRESSING_MODE)
+        PsiElement(M68kTokenType.ROUND_L)('(')
+        M68kBinaryAddExprImpl(BINARY_ADD_EXPR)
+          M68kUnaryMinusExprImpl(UNARY_MINUS_EXPR)
+            PsiElement(M68kTokenType.OP_MINUS)('-')
+            M68kLiteralExprImpl(LITERAL_EXPR)
+              PsiElement(M68kTokenType.DECIMAL)('4')
+          PsiElement(M68kTokenType.OP_PLUS)('+')
+          M68kRefExprImpl(REF_EXPR)
+            M68kSymbolReferenceImpl(SYMBOL_REFERENCE)
+              PsiElement(M68kTokenType.SYMBOL)('foo')
+        PsiElement(M68kTokenType.SEPARATOR)(',')
+        M68kAddressRegisterImpl(ADDRESS_REGISTER)
+          PsiElement(M68kTokenType.REG_SP)('sp')
+        PsiElement(M68kTokenType.SEPARATOR)(',')
+        M68kIndexRegisterImpl(INDEX_REGISTER)
+          M68kAddressRegisterImpl(ADDRESS_REGISTER)
+            PsiElement(M68kTokenType.AREG)('a0')
+          PsiElement(M68kTokenType.OP_AR_MUL)('*')
+          M68kIndexScaleImpl(INDEX_SCALE)
+            M68kLiteralExprImpl(LITERAL_EXPR)
+              PsiElement(M68kTokenType.DECIMAL)('1')
+        PsiElement(M68kTokenType.ROUND_R)(')')
+      PsiElement(M68kTokenType.SEPARATOR)(',')
+      M68kAddressRegisterIndirectWithIndexNewAddressingModeImpl(ADDRESS_REGISTER_INDIRECT_WITH_INDEX_NEW_ADDRESSING_MODE)
+        PsiElement(M68kTokenType.ROUND_L)('(')
+        M68kParenExprImpl(PAREN_EXPR)
+          PsiElement(M68kTokenType.ROUND_L)('(')
+          M68kBinaryAddExprImpl(BINARY_ADD_EXPR)
+            M68kBinaryMulExprImpl(BINARY_MUL_EXPR)
+              M68kLiteralExprImpl(LITERAL_EXPR)
+                PsiElement(M68kTokenType.DECIMAL)('10')
+              PsiElement(M68kTokenType.OP_AR_MUL)('*')
+              M68kLiteralExprImpl(LITERAL_EXPR)
+                PsiElement(M68kTokenType.DECIMAL)('20')
+            PsiElement(M68kTokenType.OP_PLUS)('+')
+            M68kLiteralExprImpl(LITERAL_EXPR)
+              PsiElement(M68kTokenType.DECIMAL)('4')
+          PsiElement(M68kTokenType.ROUND_R)(')')
+        PsiElement(M68kTokenType.SEPARATOR)(',')
+        M68kAddressRegisterImpl(ADDRESS_REGISTER)
+          PsiElement(M68kTokenType.AREG)('a1')
+        PsiElement(M68kTokenType.SEPARATOR)(',')
+        M68kIndexRegisterImpl(INDEX_REGISTER)
+          M68kDataRegisterImpl(DATA_REGISTER)
+            PsiElement(M68kTokenType.DREG)('d5')
+          M68kDataWidthImpl(DATA_WIDTH)
+            PsiElement(M68kTokenType.OPSIZE_L)('.l')
+          PsiElement(M68kTokenType.OP_AR_MUL)('*')
+          M68kIndexScaleImpl(INDEX_SCALE)
+            M68kLiteralExprImpl(LITERAL_EXPR)
+              PsiElement(M68kTokenType.DECIMAL)('2')
+        PsiElement(M68kTokenType.ROUND_R)(')')
+  PsiElement(M68kTokenType.EOL)('\n')
@@ -0,0 +1,61 @@
+Assembly File: a.asm
+  PsiWhiteSpace(' ')
+  M68kStatementImpl(STATEMENT)
+    M68kAsmInstructionImpl(ASM_INSTRUCTION)
+      M68kAsmOpImpl(ASM_OP)
+        PsiElement(M68kTokenType.MNEMONIC)('move')
+        M68kOperandSizeImpl(OPERAND_SIZE)
+          PsiElement(M68kTokenType.OPSIZE_L)('.l')
+      PsiWhiteSpace(' ')
+      M68kAddressRegisterIndirectWithIndexOldAddressingModeImpl(ADDRESS_REGISTER_INDIRECT_WITH_INDEX_OLD_ADDRESSING_MODE)
+        M68kBinaryAddExprImpl(BINARY_ADD_EXPR)
+          M68kUnaryMinusExprImpl(UNARY_MINUS_EXPR)
+            PsiElement(M68kTokenType.OP_MINUS)('-')
+            M68kLiteralExprImpl(LITERAL_EXPR)
+              PsiElement(M68kTokenType.DECIMAL)('4')
+          PsiElement(M68kTokenType.OP_PLUS)('+')
+          M68kRefExprImpl(REF_EXPR)
+            M68kSymbolReferenceImpl(SYMBOL_REFERENCE)
+              PsiElement(M68kTokenType.SYMBOL)('foo')
+        PsiElement(M68kTokenType.ROUND_L)('(')
+        M68kAddressRegisterImpl(ADDRESS_REGISTER)
+          PsiElement(M68kTokenType.REG_SP)('sp')
+        PsiElement(M68kTokenType.SEPARATOR)(',')
+        M68kIndexRegisterImpl(INDEX_REGISTER)
+          M68kDataRegisterImpl(DATA_REGISTER)
+            PsiElement(M68kTokenType.DREG)('d0')
+          M68kDataWidthImpl(DATA_WIDTH)
+            PsiElement(M68kTokenType.OPSIZE_W)('.w')
+          PsiElement(M68kTokenType.OP_AR_MUL)('*')
+          M68kIndexScaleImpl(INDEX_SCALE)
+            M68kLiteralExprImpl(LITERAL_EXPR)
+              PsiElement(M68kTokenType.DECIMAL)('8')
+        PsiElement(M68kTokenType.ROUND_R)(')')
+      PsiElement(M68kTokenType.SEPARATOR)(',')
+      M68kAddressRegisterIndirectWithIndexOldAddressingModeImpl(ADDRESS_REGISTER_INDIRECT_WITH_INDEX_OLD_ADDRESSING_MODE)
+        M68kParenExprImpl(PAREN_EXPR)
+          PsiElement(M68kTokenType.ROUND_L)('(')
+          M68kBinaryAddExprImpl(BINARY_ADD_EXPR)
+            M68kBinaryMulExprImpl(BINARY_MUL_EXPR)
+              M68kLiteralExprImpl(LITERAL_EXPR)
+                PsiElement(M68kTokenType.DECIMAL)('10')
+              PsiElement(M68kTokenType.OP_AR_MUL)('*')
+              M68kLiteralExprImpl(LITERAL_EXPR)
+                PsiElement(M68kTokenType.DECIMAL)('20')
+            PsiElement(M68kTokenType.OP_PLUS)('+')
+            M68kLiteralExprImpl(LITERAL_EXPR)
+              PsiElement(M68kTokenType.DECIMAL)('4')
+          PsiElement(M68kTokenType.ROUND_R)(')')
+        PsiElement(M68kTokenType.ROUND_L)('(')
+        M68kAddressRegisterImpl(ADDRESS_REGISTER)
+          PsiElement(M68kTokenType.AREG)('a1')
+        PsiElement(M68kTokenType.SEPARATOR)(',')
+        M68kIndexRegisterImpl(INDEX_REGISTER)
+          M68kAddressRegisterImpl(ADDRESS_REGISTER)
+            PsiElement(M68kTokenType.AREG)('a3')
+          PsiElement(M68kTokenType.OP_AR_MUL)('*')
+          M68kIndexScaleImpl(INDEX_SCALE)
+            M68kLiteralExprImpl(LITERAL_EXPR)
+              PsiElement(M68kTokenType.DECIMAL)('4')
+        PsiElement(M68kTokenType.ROUND_R)(')')
+  PsiElement(M68kTokenType.EOL)('\n')