Wrap all the asm helpers in #ifdef FEATURE_INTERPRETER

Author: janvorli

src/coreclr/vm/amd64/AsmHelpers.asm

@@ -482,23 +482,6 @@ JIT_PollGCRarePath:
     TAILJMP_RAX
 LEAF_END JIT_PollGC, _TEXT
 
-ifdef FEATURE_INTERPRETER
-NESTED_ENTRY InterpreterStub, _TEXT
-
-        PROLOG_WITH_TRANSITION_BLOCK
-
-        ;
-        ; call ExecuteInterpretedMethod
-        ;
-        lea             rcx, [rsp + __PWTB_TransitionBlock]     ; pTransitionBlock*
-        mov             rdx, METHODDESC_REGISTER
-        call            ExecuteInterpretedMethod
-
-        EPILOG_WITH_TRANSITION_BLOCK_RETURN
-
-NESTED_END InterpreterStub, _TEXT
-endif ; FEATURE_INTERPRETER
-
 ; rcx -This pointer
 ; rdx -ReturnBuffer
 LEAF_ENTRY ThisPtrRetBufPrecodeWorker, _TEXT
@@ -629,6 +612,23 @@ NESTED_ENTRY CallEHFilterFunclet, _TEXT
         ret
 NESTED_END CallEHFilterFunclet, _TEXT
 
+ifdef FEATURE_INTERPRETER
+
+NESTED_ENTRY InterpreterStub, _TEXT
+
+        PROLOG_WITH_TRANSITION_BLOCK
+
+        ;
+        ; call ExecuteInterpretedMethod
+        ;
+        lea             rcx, [rsp + __PWTB_TransitionBlock]     ; pTransitionBlock*
+        mov             rdx, METHODDESC_REGISTER
+        call            ExecuteInterpretedMethod
+
+        EPILOG_WITH_TRANSITION_BLOCK_RETURN
+
+NESTED_END InterpreterStub, _TEXT
+
 ; Copy arguments from the interpreter stack to the processor stack.
 ; The CPU stack slots are aligned to pointer size.
 LEAF_ENTRY Load_Stack, _TEXT
@@ -911,4 +911,6 @@ END_PROLOGUE
         ret
 NESTED_END CallJittedMethodRetI8, _TEXT
 
+endif ; FEATURE_INTERPRETER
+
         end

src/coreclr/vm/amd64/asmhelpers.S

@@ -334,25 +334,6 @@ LOCAL_LABEL(JIT_PollGCRarePath):
         jmp     rax
 LEAF_END  JIT_PollGC, _TEXT
 
-#ifdef FEATURE_INTERPRETER
-NESTED_ENTRY InterpreterStub, _TEXT, NoHandler
-
-        PROLOG_WITH_TRANSITION_BLOCK 8, 0, 0, 0, 0
-        mov             [rsp], rax // Return buffer in Swift calling convention
-
-        #
-        # call ExecuteInterpretedMethod
-        #
-        lea             rdi, [rsp + __PWTB_TransitionBlock]     // pTransitionBlock*
-        mov             rsi, METHODDESC_REGISTER
-        call            C_FUNC(ExecuteInterpretedMethod)
-
-        mov             rax, [rsp]
-        EPILOG_WITH_TRANSITION_BLOCK_RETURN
-
-NESTED_END InterpreterStub, _TEXT
-#endif // FEATURE_INTERPRETER
-
 //rdi -This pointer
 //rsi -ReturnBuffer
 LEAF_ENTRY ThisPtrRetBufPrecodeWorker, _TEXT
@@ -453,6 +434,25 @@ NESTED_ENTRY CallEHFilterFunclet, _TEXT, NoHandler
         ret
 NESTED_END CallEHFilterFunclet, _TEXT
 
+#ifdef FEATURE_INTERPRETER
+
+NESTED_ENTRY InterpreterStub, _TEXT, NoHandler
+
+        PROLOG_WITH_TRANSITION_BLOCK 8, 0, 0, 0, 0
+        mov             [rsp], rax // Return buffer in Swift calling convention
+
+        #
+        # call ExecuteInterpretedMethod
+        #
+        lea             rdi, [rsp + __PWTB_TransitionBlock]     // pTransitionBlock*
+        mov             rsi, METHODDESC_REGISTER
+        call            C_FUNC(ExecuteInterpretedMethod)
+
+        mov             rax, [rsp]
+        EPILOG_WITH_TRANSITION_BLOCK_RETURN
+
+NESTED_END InterpreterStub, _TEXT
+
 // Copy arguments from the interpreter stack to the processor stack.
 // The CPU stack slots are aligned to pointer size.
 LEAF_ENTRY Load_Stack, _TEXT
@@ -1153,3 +1153,5 @@ END_PROLOGUE
         pop rbp
         ret
 NESTED_END CallJittedMethodRetDoubleDouble, _TEXT
+
+#endif // FEATURE_INTERPRETER

src/coreclr/vm/arm64/asmhelpers.S

@@ -845,6 +845,16 @@ LOCAL_LABEL(JIT_PollGCRarePath):
         br x9
 LEAF_END  JIT_PollGC, _TEXT
 
+//x0 -This pointer
+//x1 -ReturnBuffer
+LEAF_ENTRY ThisPtrRetBufPrecodeWorker, _TEXT
+    ldr  x12, [METHODDESC_REGISTER, #ThisPtrRetBufPrecodeData__Target]
+    mov  x11, x0     // Move first arg pointer to temp register
+    mov  x0,  x1     // Move ret buf arg pointer from location in ABI for return buffer for instance method to location in ABI for return buffer for static method
+    mov  x1, x11     // Move temp register to first arg register for static method with return buffer
+    EPILOG_BRANCH_REG x12
+LEAF_END ThisPtrRetBufPrecodeWorker, _TEXT
+
 #ifdef FEATURE_INTERPRETER
 NESTED_ENTRY InterpreterStub, _TEXT, NoHandler
 
@@ -858,17 +868,6 @@ NESTED_ENTRY InterpreterStub, _TEXT, NoHandler
     EPILOG_WITH_TRANSITION_BLOCK_RETURN
 
 NESTED_END InterpreterStub, _TEXT
-#endif // FEATURE_INTERPRETER
-
-//x0 -This pointer
-//x1 -ReturnBuffer
-LEAF_ENTRY ThisPtrRetBufPrecodeWorker, _TEXT
-    ldr  x12, [METHODDESC_REGISTER, #ThisPtrRetBufPrecodeData__Target]
-    mov  x11, x0     // Move first arg pointer to temp register
-    mov  x0,  x1     // Move ret buf arg pointer from location in ABI for return buffer for instance method to location in ABI for return buffer for static method
-    mov  x1, x11     // Move temp register to first arg register for static method with return buffer
-    EPILOG_BRANCH_REG x12
-LEAF_END ThisPtrRetBufPrecodeWorker, _TEXT
 
 // Copy arguments from the interpreter stack to the processor stack
 // The CPU stack slots are aligned to pointer size.
@@ -1463,3 +1462,5 @@ NESTED_ENTRY CallJittedMethodRet4Float, _TEXT, NoHandler
     EPILOG_RESTORE_REG_PAIR_INDEXED fp, lr, 32
     EPILOG_RETURN
 NESTED_END CallJittedMethodRet4Float, _TEXT
+
+#endif // FEATURE_INTERPRETER

src/coreclr/vm/arm64/asmhelpers.asm

@@ -1228,7 +1228,18 @@ JIT_PollGCRarePath
         br x9
     LEAF_END
 
+;x0 -This pointer
+;x1 -ReturnBuffer
+    LEAF_ENTRY ThisPtrRetBufPrecodeWorker
+        ldr  x12, [METHODDESC_REGISTER, #ThisPtrRetBufPrecodeData__Target]
+        mov  x11, x0     ; Move first arg pointer to temp register
+        mov  x0,  x1     ; Move ret buf arg pointer from location in ABI for return buffer for instance method to location in ABI for return buffer for static method
+        mov  x1, x11     ; Move temp register to first arg register for static method with return buffer
+        EPILOG_BRANCH_REG x12
+    LEAF_END
+
 #ifdef FEATURE_INTERPRETER
+
     NESTED_ENTRY InterpreterStub
 
         PROLOG_WITH_TRANSITION_BLOCK
@@ -1241,17 +1252,6 @@ JIT_PollGCRarePath
         EPILOG_WITH_TRANSITION_BLOCK_RETURN
 
     NESTED_END
-#endif // FEATURE_INTERPRETER
-
-;x0 -This pointer
-;x1 -ReturnBuffer
-    LEAF_ENTRY ThisPtrRetBufPrecodeWorker
-        ldr  x12, [METHODDESC_REGISTER, #ThisPtrRetBufPrecodeData__Target]
-        mov  x11, x0     ; Move first arg pointer to temp register
-        mov  x0,  x1     ; Move ret buf arg pointer from location in ABI for return buffer for instance method to location in ABI for return buffer for static method
-        mov  x1, x11     ; Move temp register to first arg register for static method with return buffer
-        EPILOG_BRANCH_REG x12
-    LEAF_END
 
     ; Copy arguments from the interpreter stack to the processor stack
     ; The CPU stack slots are aligned to pointer size.
@@ -1808,5 +1808,7 @@ CopyLoop
         EPILOG_RETURN
     NESTED_END CallJittedMethodRet4Float
 
+#endif // FEATURE_INTERPRETER
+
 ; Must be at very end of file
     END