diff options
author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-04-02 11:03:19 -0700 |
---|---|---|
committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-04-02 11:03:19 -0700 |
commit | a1204591a52bf668ee72c86f98f53189621572a2 (patch) | |
tree | 18794edb58c684c3db8878450a4c1bf257d9873b /target-arm/it_helper.h | |
parent | 0d6e3e2b1510319f218d8b6f1590f25079d4fc4a (diff) | |
download | external_qemu-a1204591a52bf668ee72c86f98f53189621572a2.zip external_qemu-a1204591a52bf668ee72c86f98f53189621572a2.tar.gz external_qemu-a1204591a52bf668ee72c86f98f53189621572a2.tar.bz2 |
Revert change I7af83e21c64d217c6b28bf6cb5ee2e2f23182c95 to fix Froyo build.
Apparently, that change that supposedly fixed AT-related ARMv7 bug broke
DexOpt step in the build process, resulting in trashed files that crash
the device. Rolling this change back to fix Froyo, until cause of the
DexOpt breaking has been found and fixed
Change-Id: I33b417fcbd65767f7cfe60f5fb5ffa32610b4852
Diffstat (limited to 'target-arm/it_helper.h')
-rw-r--r-- | target-arm/it_helper.h | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/target-arm/it_helper.h b/target-arm/it_helper.h deleted file mode 100644 index 7982174..0000000 --- a/target-arm/it_helper.h +++ /dev/null @@ -1,83 +0,0 @@ -/* Copyright (C) 2007-2010 The Android Open Source Project -** -** This software is licensed under the terms of the GNU General Public -** License version 2, as published by the Free Software Foundation, and -** may be copied, distributed, and modified under those terms. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -*/ - -/* - * Contains implementation of helper routines for IT block support. - */ - -#ifndef QEMU_TARGET_ARM_IT_HELPER_H -#define QEMU_TARGET_ARM_IT_HELPER_H - -/* Gets condition bits from ITSTATE. - * Return: - * ITSTATE condition bits in the low 4 bits of the returned value. - */ -static inline uint8_t -itstate_cond(uint8_t itstate) -{ - return (itstate >> 4) & 0xf; -} - -/* Checks if ITSTATE defines the last instruction in an IT block. - * Param: - * itstate - ITSTATE for an instruction in an IT block. - * Return: - * boolean: 1 if an instruction is the last instruction in its IT block, - * or zero if there are more instruction in the IT block. - */ -static inline int -itstate_is_last_it_insn(uint8_t itstate) -{ - return (itstate & 0x7) == 0; -} - -/* Checks if ITSTATE suggests that an IT block instruction is being translated. - * Return: - * boolean: 1 if an IT block instruction is being translated, or zero if - * a "normal" instruction is being translated. - */ -static inline int -itstate_is_in_it_block(uint8_t itstate) -{ - return (itstate & 0xff) != 0; -} - -/* Advances ITSTATE to the next instruction in an IT block. - * Param: - * itstate - ITSTATE of the currently executing instruction. - * Retunn: - * ITSTATE for the next instruction in an IT block, or zero is currently - * executing instruction was the last IT block instruction. - */ -static inline uint8_t -itstate_advance(uint8_t itstate) -{ - if (itstate_is_last_it_insn(itstate)) { - return 0; - } else { - return (itstate & 0xe0) | ((itstate & 0xf) << 1); - } -} - -/* Checks if given THUMB instruction is an IT instruction. - * Param: - * insn - THUMB instruction to check. - * Return: - * boolean: 1 if instruction is IT instruction, or zero otherwise. - */ -static inline int -is_it_insn(uint16_t insn) -{ - return (insn & 0xff00) == 0xbf00 && (insn & 0x000f) != 0; -} - -#endif // QEMU_TARGET_ARM_IT_HELPER_H |