avoid confusion between macro & variable use_idiv_instructions (ARM backend)
This commit is contained in:
parent
d9249b91c2
commit
3b52af4fbd
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_AARCH64_H
|
#ifndef UNICORN_AUTOGEN_AARCH64_H
|
||||||
#define UNICORN_AUTOGEN_AARCH64_H
|
#define UNICORN_AUTOGEN_AARCH64_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_aarch64
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_aarch64
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_aarch64
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_aarch64
|
||||||
#define helper_power_down helper_power_down_aarch64
|
#define helper_power_down helper_power_down_aarch64
|
||||||
#define check_exit_request check_exit_request_aarch64
|
#define check_exit_request check_exit_request_aarch64
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_ARM_H
|
#ifndef UNICORN_AUTOGEN_ARM_H
|
||||||
#define UNICORN_AUTOGEN_ARM_H
|
#define UNICORN_AUTOGEN_ARM_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_arm
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_arm
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_arm
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_arm
|
||||||
#define helper_power_down helper_power_down_arm
|
#define helper_power_down helper_power_down_arm
|
||||||
#define check_exit_request check_exit_request_arm
|
#define check_exit_request check_exit_request_arm
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
symbols = (
|
symbols = (
|
||||||
'use_idiv_instructions',
|
'use_idiv_instructions_rt',
|
||||||
'tcg_target_deposit_valid',
|
'tcg_target_deposit_valid',
|
||||||
'helper_power_down',
|
'helper_power_down',
|
||||||
'check_exit_request',
|
'check_exit_request',
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_M68K_H
|
#ifndef UNICORN_AUTOGEN_M68K_H
|
||||||
#define UNICORN_AUTOGEN_M68K_H
|
#define UNICORN_AUTOGEN_M68K_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_m68k
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_m68k
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_m68k
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_m68k
|
||||||
#define helper_power_down helper_power_down_m68k
|
#define helper_power_down helper_power_down_m68k
|
||||||
#define check_exit_request check_exit_request_m68k
|
#define check_exit_request check_exit_request_m68k
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_MIPS_H
|
#ifndef UNICORN_AUTOGEN_MIPS_H
|
||||||
#define UNICORN_AUTOGEN_MIPS_H
|
#define UNICORN_AUTOGEN_MIPS_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_mips
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_mips
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_mips
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_mips
|
||||||
#define helper_power_down helper_power_down_mips
|
#define helper_power_down helper_power_down_mips
|
||||||
#define check_exit_request check_exit_request_mips
|
#define check_exit_request check_exit_request_mips
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_MIPS64_H
|
#ifndef UNICORN_AUTOGEN_MIPS64_H
|
||||||
#define UNICORN_AUTOGEN_MIPS64_H
|
#define UNICORN_AUTOGEN_MIPS64_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_mips64
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_mips64
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_mips64
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_mips64
|
||||||
#define helper_power_down helper_power_down_mips64
|
#define helper_power_down helper_power_down_mips64
|
||||||
#define check_exit_request check_exit_request_mips64
|
#define check_exit_request check_exit_request_mips64
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_MIPS64EL_H
|
#ifndef UNICORN_AUTOGEN_MIPS64EL_H
|
||||||
#define UNICORN_AUTOGEN_MIPS64EL_H
|
#define UNICORN_AUTOGEN_MIPS64EL_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_mips64el
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_mips64el
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_mips64el
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_mips64el
|
||||||
#define helper_power_down helper_power_down_mips64el
|
#define helper_power_down helper_power_down_mips64el
|
||||||
#define check_exit_request check_exit_request_mips64el
|
#define check_exit_request check_exit_request_mips64el
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_MIPSEL_H
|
#ifndef UNICORN_AUTOGEN_MIPSEL_H
|
||||||
#define UNICORN_AUTOGEN_MIPSEL_H
|
#define UNICORN_AUTOGEN_MIPSEL_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_mipsel
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_mipsel
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_mipsel
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_mipsel
|
||||||
#define helper_power_down helper_power_down_mipsel
|
#define helper_power_down helper_power_down_mipsel
|
||||||
#define check_exit_request check_exit_request_mipsel
|
#define check_exit_request check_exit_request_mipsel
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_POWERPC_H
|
#ifndef UNICORN_AUTOGEN_POWERPC_H
|
||||||
#define UNICORN_AUTOGEN_POWERPC_H
|
#define UNICORN_AUTOGEN_POWERPC_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_powerpc
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_powerpc
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_powerpc
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_powerpc
|
||||||
#define helper_power_down helper_power_down_powerpc
|
#define helper_power_down helper_power_down_powerpc
|
||||||
#define check_exit_request check_exit_request_powerpc
|
#define check_exit_request check_exit_request_powerpc
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_SPARC_H
|
#ifndef UNICORN_AUTOGEN_SPARC_H
|
||||||
#define UNICORN_AUTOGEN_SPARC_H
|
#define UNICORN_AUTOGEN_SPARC_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_sparc
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_sparc
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_sparc
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_sparc
|
||||||
#define helper_power_down helper_power_down_sparc
|
#define helper_power_down helper_power_down_sparc
|
||||||
#define check_exit_request check_exit_request_sparc
|
#define check_exit_request check_exit_request_sparc
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_SPARC64_H
|
#ifndef UNICORN_AUTOGEN_SPARC64_H
|
||||||
#define UNICORN_AUTOGEN_SPARC64_H
|
#define UNICORN_AUTOGEN_SPARC64_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_sparc64
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_sparc64
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_sparc64
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_sparc64
|
||||||
#define helper_power_down helper_power_down_sparc64
|
#define helper_power_down helper_power_down_sparc64
|
||||||
#define check_exit_request check_exit_request_sparc64
|
#define check_exit_request check_exit_request_sparc64
|
||||||
|
@ -57,7 +57,7 @@ static int arm_arch = __ARM_ARCH;
|
|||||||
#define use_armv7_instructions (__ARM_ARCH >= 7 || arm_arch >= 7)
|
#define use_armv7_instructions (__ARM_ARCH >= 7 || arm_arch >= 7)
|
||||||
|
|
||||||
#ifndef use_idiv_instructions
|
#ifndef use_idiv_instructions
|
||||||
bool use_idiv_instructions;
|
bool use_idiv_instructions_rt;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ??? Ought to think about changing CONFIG_SOFTMMU to always defined. */
|
/* ??? Ought to think about changing CONFIG_SOFTMMU to always defined. */
|
||||||
@ -1984,7 +1984,7 @@ static void tcg_target_init(TCGContext *s)
|
|||||||
#ifndef use_idiv_instructions
|
#ifndef use_idiv_instructions
|
||||||
{
|
{
|
||||||
unsigned long hwcap = qemu_getauxval(AT_HWCAP);
|
unsigned long hwcap = qemu_getauxval(AT_HWCAP);
|
||||||
use_idiv_instructions = (hwcap & HWCAP_ARM_IDIVA) != 0;
|
use_idiv_instructions_rt = (hwcap & HWCAP_ARM_IDIVA) != 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (__ARM_ARCH < 7) {
|
if (__ARM_ARCH < 7) {
|
||||||
|
@ -52,7 +52,8 @@ typedef enum {
|
|||||||
#ifdef __ARM_ARCH_EXT_IDIV__
|
#ifdef __ARM_ARCH_EXT_IDIV__
|
||||||
#define use_idiv_instructions 1
|
#define use_idiv_instructions 1
|
||||||
#else
|
#else
|
||||||
extern bool use_idiv_instructions;
|
extern bool use_idiv_instructions_rt;
|
||||||
|
#define use_idiv_instructions use_idiv_instructions_rt
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
/* Autogen header for Unicorn Engine - DONOT MODIFY */
|
||||||
#ifndef UNICORN_AUTOGEN_X86_64_H
|
#ifndef UNICORN_AUTOGEN_X86_64_H
|
||||||
#define UNICORN_AUTOGEN_X86_64_H
|
#define UNICORN_AUTOGEN_X86_64_H
|
||||||
#define use_idiv_instructions use_idiv_instructions_x86_64
|
#define use_idiv_instructions_rt use_idiv_instructions_rt_x86_64
|
||||||
#define tcg_target_deposit_valid tcg_target_deposit_valid_x86_64
|
#define tcg_target_deposit_valid tcg_target_deposit_valid_x86_64
|
||||||
#define helper_power_down helper_power_down_x86_64
|
#define helper_power_down helper_power_down_x86_64
|
||||||
#define check_exit_request check_exit_request_x86_64
|
#define check_exit_request check_exit_request_x86_64
|
||||||
|
Loading…
Reference in New Issue
Block a user