commit 4717175e40a19e79af904dfb7b7dd13f046debd7
author Nicolas Geoffray <ngeoffray@google.com> Mon Aug 31 15:03:20 2020 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Mon Sep 07 07:29:59 2020 +0000
tree 426f040eacf5a8305f8bb8d504bd509824d984c8
parent 1faacf59b9f74e9d2de4e0331ef0cdfcf132225d

Move code item to the data pointer and remove code_item_offset.

This saves 4 bytes on 32bit and 8 bytes on 64bit on ArtMethod.

Also update nterp to directly fetch the code item from the data pointer.

Test: test.py
Bug: 112676029

Change-Id: Ic01f43c7ccf2cbce1ec517478e81362232d36371

tools/cpp-define-generator/art_method.def

diff --git a/tools/cpp-define-generator/art_method.def b/tools/cpp-define-generator/art_method.def
index 75fbab0..097d466 100644
--- a/tools/cpp-define-generator/art_method.def
+++ b/tools/cpp-define-generator/art_method.def
@@ -28,6 +28,10 @@
            art::ArtMethod::EntryPointFromJniOffset(art::PointerSize::k32).Int32Value())
 ASM_DEFINE(ART_METHOD_JNI_OFFSET_64,
            art::ArtMethod::EntryPointFromJniOffset(art::PointerSize::k64).Int32Value())
+ASM_DEFINE(ART_METHOD_DATA_OFFSET_32,
+           art::ArtMethod::DataOffset(art::PointerSize::k32).Int32Value())
+ASM_DEFINE(ART_METHOD_DATA_OFFSET_64,
+           art::ArtMethod::DataOffset(art::PointerSize::k64).Int32Value())
 ASM_DEFINE(ART_METHOD_QUICK_CODE_OFFSET_32,
            art::ArtMethod::EntryPointFromQuickCompiledCodeOffset(art::PointerSize::k32).Int32Value())
 ASM_DEFINE(ART_METHOD_QUICK_CODE_OFFSET_64,