From fc9555dac51a3cf12bb13f4e3781d2f2f6c9f91f Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Sun, 5 Nov 2017 16:32:19 -0800
Subject: 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
---
 tools/cpp-define-generator/offset_codeitem.def | 33 --------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 tools/cpp-define-generator/offset_codeitem.def

(limited to 'tools/cpp-define-generator/offset_codeitem.def')

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
-- 
cgit v1.2.3-59-g8ed1b

