diff options
| author | 2017-11-05 16:32:19 -0800 | |
|---|---|---|
| committer | 2017-11-05 17:11:15 -0800 | |
| commit | fc9555dac51a3cf12bb13f4e3781d2f2f6c9f91f (patch) | |
| tree | 4b7e722061366679f2fbe3478c3fb3ca029b8620 /tools/cpp-define-generator | |
| parent | fd443eb00b2456006f03252ba085c1f851e8adf5 (diff) | |
Remove mterp reliance on code item layout
Pass dex instruction pointer intead of code item pointer to the mterp
entry code. This removes a dependency on the code item layout since it
may change in the future for compact dex.
Bug: 63756964
Test: test/testrunner/testrunner.py --host -j40
Change-Id: Icfffb2e17372439f0833ecce1c0ddb05e7e7e69c
Diffstat (limited to 'tools/cpp-define-generator')
| -rw-r--r-- | tools/cpp-define-generator/offset_codeitem.def | 33 | ||||
| -rw-r--r-- | tools/cpp-define-generator/offsets_all.def | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/tools/cpp-define-generator/offset_codeitem.def b/tools/cpp-define-generator/offset_codeitem.def deleted file mode 100644 index e5acd1d93d..0000000000 --- a/tools/cpp-define-generator/offset_codeitem.def +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2016 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. - */ - -// Offsets within CodeItem. - -#if defined(DEFINE_INCLUDE_DEPENDENCIES) -#include <cstddef> // offsetof -#include "dex_file.h" // art::DexFile -#endif - -#include "common.def" // DEFINE_OFFSET_EXPR - -#define DEFINE_CODEITEM_OFFSET(field_name) \ - DEFINE_OFFSET_EXPR(CodeItem, field_name, int32_t, offsetof(art::DexFile::CodeItem, field_name ## _)) - -// Field Name -DEFINE_CODEITEM_OFFSET(insns) - -#undef DEFINE_CODEITEM_OFFSET -#include "common_undef.def" // undef DEFINE_OFFSET_EXPR diff --git a/tools/cpp-define-generator/offsets_all.def b/tools/cpp-define-generator/offsets_all.def index c2e8c9728c..31587d8d62 100644 --- a/tools/cpp-define-generator/offsets_all.def +++ b/tools/cpp-define-generator/offsets_all.def @@ -40,7 +40,6 @@ #include "offset_thread.def" // TODO: SHADOW_FRAME depends on __SIZEOF__POINTER__ // #include "offset_shadow_frame.def" -#include "offset_codeitem.def" // TODO: MIRROR_OBJECT_HEADER_SIZE (depends on #ifdef read barrier) #include "offset_mirror_class.def" #include "offset_mirror_dex_cache.def" |