From 24ac537cf8d214f7f1bcb07aace429521247d1eb Mon Sep 17 00:00:00 2001 From: Ben Cheng Date: Wed, 16 Dec 2009 13:15:53 -0800 Subject: [PATCH] Move VFP register save/restore routines from template to codegen. Code in the template directory will occupy space in the code cache and is invoked from JIT'ed code. Since these routines are only invoked from statically compiled functions we can move them to the codegen directory which also has arch-variant configurations. --- vm/Dvm.mk | 1 + .../codegen/arm/armv5te-vfp/CallingConvention.S | 34 ++++++++++++++++++++++ .../codegen/arm/armv5te/CallingConvention.S | 32 ++++++++++++++++++++ .../codegen/arm/armv7-a/CallingConvention.S | 34 ++++++++++++++++++++++ vm/compiler/template/armv5te-vfp/platform.S | 20 ------------- vm/compiler/template/armv5te/platform.S | 18 ------------ .../template/out/CompilerTemplateAsm-armv5te-vfp.S | 20 ------------- .../template/out/CompilerTemplateAsm-armv5te.S | 18 ------------ .../template/out/CompilerTemplateAsm-armv7-a.S | 20 ------------- 9 files changed, 101 insertions(+), 96 deletions(-) create mode 100644 vm/compiler/codegen/arm/armv5te-vfp/CallingConvention.S create mode 100644 vm/compiler/codegen/arm/armv5te/CallingConvention.S create mode 100644 vm/compiler/codegen/arm/armv7-a/CallingConvention.S diff --git a/vm/Dvm.mk b/vm/Dvm.mk index b5d326bc4..3f5c6d532 100644 --- a/vm/Dvm.mk +++ b/vm/Dvm.mk @@ -278,6 +278,7 @@ ifeq ($(dvm_arch),arm) LOCAL_SRC_FILES += \ compiler/codegen/arm/RallocUtil.c \ compiler/codegen/arm/$(dvm_arch_variant)/Codegen.c \ + compiler/codegen/arm/$(dvm_arch_variant)/CallingConvention.S \ compiler/codegen/arm/Assemble.c \ compiler/codegen/arm/ArchUtility.c \ compiler/codegen/arm/LocalOptimizations.c \ diff --git a/vm/compiler/codegen/arm/armv5te-vfp/CallingConvention.S b/vm/compiler/codegen/arm/armv5te-vfp/CallingConvention.S new file mode 100644 index 000000000..4f1239564 --- /dev/null +++ b/vm/compiler/codegen/arm/armv5te-vfp/CallingConvention.S @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Save & restore for callee-save FP registers. + * On entry: + * r0 : pointer to save area of JIT_CALLEE_SAVE_WORD_SIZE + */ + .text + .align 2 + .global dvmJitCalleeSave + .type dvmJitCalleeSave, %function +dvmJitCalleeSave: + vstmia r0, {d8-d15} + bx lr + + .global dvmJitCalleeRestore + .type dvmJitCalleeRestore, %function +dvmJitCalleeRestore: + vldmia r0, {d8-d15} + bx lr diff --git a/vm/compiler/codegen/arm/armv5te/CallingConvention.S b/vm/compiler/codegen/arm/armv5te/CallingConvention.S new file mode 100644 index 000000000..0cbc64fa6 --- /dev/null +++ b/vm/compiler/codegen/arm/armv5te/CallingConvention.S @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Save & restore for callee-save FP registers. + * On entry: + * r0 : pointer to save area of JIT_CALLEE_SAVE_WORD_SIZE + */ + .text + .align 2 + .global dvmJitCalleeSave + .type dvmJitCalleeSave, %function +dvmJitCalleeSave: + bx lr + + .global dvmJitCalleeRestore + .type dvmJitCalleeRestore, %function +dvmJitCalleeRestore: + bx lr diff --git a/vm/compiler/codegen/arm/armv7-a/CallingConvention.S b/vm/compiler/codegen/arm/armv7-a/CallingConvention.S new file mode 100644 index 000000000..4f1239564 --- /dev/null +++ b/vm/compiler/codegen/arm/armv7-a/CallingConvention.S @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Save & restore for callee-save FP registers. + * On entry: + * r0 : pointer to save area of JIT_CALLEE_SAVE_WORD_SIZE + */ + .text + .align 2 + .global dvmJitCalleeSave + .type dvmJitCalleeSave, %function +dvmJitCalleeSave: + vstmia r0, {d8-d15} + bx lr + + .global dvmJitCalleeRestore + .type dvmJitCalleeRestore, %function +dvmJitCalleeRestore: + vldmia r0, {d8-d15} + bx lr diff --git a/vm/compiler/template/armv5te-vfp/platform.S b/vm/compiler/template/armv5te-vfp/platform.S index 4c8c2a299..880e8750f 100644 --- a/vm/compiler/template/armv5te-vfp/platform.S +++ b/vm/compiler/template/armv5te-vfp/platform.S @@ -14,23 +14,3 @@ mov lr, pc ldr pc, \source .endm - -/* - * Save & restore for callee-save FP registers. - * On entry: - * r0 : pointer to save area of JIT_CALLEE_SAVE_WORD_SIZE - */ - .text - .align 2 - .global dvmJitCalleeSave - .type dvmJitCalleeSave, %function -dvmJitCalleeSave: - vstmia r0, {d8-d15} - bx lr - - .global dvmJitCalleeRestore - .type dvmJitCalleeRestore, %function -dvmJitCalleeRestore: - vldmia r0, {d8-d15} - bx lr - diff --git a/vm/compiler/template/armv5te/platform.S b/vm/compiler/template/armv5te/platform.S index 3cefa6d46..880e8750f 100644 --- a/vm/compiler/template/armv5te/platform.S +++ b/vm/compiler/template/armv5te/platform.S @@ -14,21 +14,3 @@ mov lr, pc ldr pc, \source .endm - -/* - * Save & restore for callee-save FP registers. - * On entry: - * r0 : pointer to save area of JIT_CALLEE_SAVE_WORD_SIZE - */ - .text - .align 2 - .global dvmJitCalleeSave - .type dvmJitCalleeSave, %function -dvmJitCalleeSave: - bx lr - - .global dvmJitCalleeRestore - .type dvmJitCalleeRestore, %function -dvmJitCalleeRestore: - bx lr - diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S b/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S index 0dfb9867a..104e6ba50 100644 --- a/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S +++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S @@ -120,26 +120,6 @@ unspecified registers or condition codes. ldr pc, \source .endm -/* - * Save & restore for callee-save FP registers. - * On entry: - * r0 : pointer to save area of JIT_CALLEE_SAVE_WORD_SIZE - */ - .text - .align 2 - .global dvmJitCalleeSave - .type dvmJitCalleeSave, %function -dvmJitCalleeSave: - vstmia r0, {d8-d15} - bx lr - - .global dvmJitCalleeRestore - .type dvmJitCalleeRestore, %function -dvmJitCalleeRestore: - vldmia r0, {d8-d15} - bx lr - - .global dvmCompilerTemplateStart .type dvmCompilerTemplateStart, %function diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S index 0e7949769..3040b193c 100644 --- a/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S +++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S @@ -120,24 +120,6 @@ unspecified registers or condition codes. ldr pc, \source .endm -/* - * Save & restore for callee-save FP registers. - * On entry: - * r0 : pointer to save area of JIT_CALLEE_SAVE_WORD_SIZE - */ - .text - .align 2 - .global dvmJitCalleeSave - .type dvmJitCalleeSave, %function -dvmJitCalleeSave: - bx lr - - .global dvmJitCalleeRestore - .type dvmJitCalleeRestore, %function -dvmJitCalleeRestore: - bx lr - - .global dvmCompilerTemplateStart .type dvmCompilerTemplateStart, %function diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S index ff6965305..926e1d757 100644 --- a/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S +++ b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S @@ -120,26 +120,6 @@ unspecified registers or condition codes. ldr pc, \source .endm -/* - * Save & restore for callee-save FP registers. - * On entry: - * r0 : pointer to save area of JIT_CALLEE_SAVE_WORD_SIZE - */ - .text - .align 2 - .global dvmJitCalleeSave - .type dvmJitCalleeSave, %function -dvmJitCalleeSave: - vstmia r0, {d8-d15} - bx lr - - .global dvmJitCalleeRestore - .type dvmJitCalleeRestore, %function -dvmJitCalleeRestore: - vldmia r0, {d8-d15} - bx lr - - .global dvmCompilerTemplateStart .type dvmCompilerTemplateStart, %function -- 2.11.0