From f8388a6c03e77d610f6b89aa52449cfb4e84c151 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 10 Feb 2018 23:21:41 -0500 Subject: [PATCH] header_gen: Fix mips platform --- qemu/aarch64.h | 1 - qemu/aarch64eb.h | 1 - qemu/arm.h | 1 - qemu/armeb.h | 1 - qemu/header_gen.py | 1 - qemu/m68k.h | 1 - qemu/mips.h | 1 - qemu/mips64.h | 1 - qemu/mips64el.h | 1 - qemu/mipsel.h | 1 - qemu/powerpc.h | 1 - qemu/sparc.h | 1 - qemu/sparc64.h | 1 - qemu/target-mips/translate.c | 2 +- qemu/x86_64.h | 1 - 15 files changed, 1 insertion(+), 15 deletions(-) diff --git a/qemu/aarch64.h b/qemu/aarch64.h index 00dc23af..fb6945f0 100644 --- a/qemu/aarch64.h +++ b/qemu/aarch64.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_aarch64 #define tcg_gen_subi_i32 tcg_gen_subi_i32_aarch64 #define tcg_gen_subi_i64 tcg_gen_subi_i64_aarch64 -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_aarch64 #define tcg_gen_xor_i32 tcg_gen_xor_i32_aarch64 #define tcg_gen_xor_i64 tcg_gen_xor_i64_aarch64 #define tcg_gen_xori_i32 tcg_gen_xori_i32_aarch64 diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h index 6ec7c678..46add07c 100644 --- a/qemu/aarch64eb.h +++ b/qemu/aarch64eb.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_aarch64eb #define tcg_gen_subi_i32 tcg_gen_subi_i32_aarch64eb #define tcg_gen_subi_i64 tcg_gen_subi_i64_aarch64eb -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_aarch64eb #define tcg_gen_xor_i32 tcg_gen_xor_i32_aarch64eb #define tcg_gen_xor_i64 tcg_gen_xor_i64_aarch64eb #define tcg_gen_xori_i32 tcg_gen_xori_i32_aarch64eb diff --git a/qemu/arm.h b/qemu/arm.h index 851321f0..ee1938bf 100644 --- a/qemu/arm.h +++ b/qemu/arm.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_arm #define tcg_gen_subi_i32 tcg_gen_subi_i32_arm #define tcg_gen_subi_i64 tcg_gen_subi_i64_arm -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_arm #define tcg_gen_xor_i32 tcg_gen_xor_i32_arm #define tcg_gen_xor_i64 tcg_gen_xor_i64_arm #define tcg_gen_xori_i32 tcg_gen_xori_i32_arm diff --git a/qemu/armeb.h b/qemu/armeb.h index da7a81c7..85ad2594 100644 --- a/qemu/armeb.h +++ b/qemu/armeb.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_armeb #define tcg_gen_subi_i32 tcg_gen_subi_i32_armeb #define tcg_gen_subi_i64 tcg_gen_subi_i64_armeb -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_armeb #define tcg_gen_xor_i32 tcg_gen_xor_i32_armeb #define tcg_gen_xor_i64 tcg_gen_xor_i64_armeb #define tcg_gen_xori_i32 tcg_gen_xori_i32_armeb diff --git a/qemu/header_gen.py b/qemu/header_gen.py index 99bf5728..e763bff6 100644 --- a/qemu/header_gen.py +++ b/qemu/header_gen.py @@ -2852,7 +2852,6 @@ symbols = ( 'tcg_gen_subfi_i64', 'tcg_gen_subi_i32', 'tcg_gen_subi_i64', - 'tcg_gen_trunc_i64_i32', 'tcg_gen_xor_i32', 'tcg_gen_xor_i64', 'tcg_gen_xori_i32', diff --git a/qemu/m68k.h b/qemu/m68k.h index ed09ff96..c5aecf5d 100644 --- a/qemu/m68k.h +++ b/qemu/m68k.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_m68k #define tcg_gen_subi_i32 tcg_gen_subi_i32_m68k #define tcg_gen_subi_i64 tcg_gen_subi_i64_m68k -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_m68k #define tcg_gen_xor_i32 tcg_gen_xor_i32_m68k #define tcg_gen_xor_i64 tcg_gen_xor_i64_m68k #define tcg_gen_xori_i32 tcg_gen_xori_i32_m68k diff --git a/qemu/mips.h b/qemu/mips.h index 09b8edda..90d69f28 100644 --- a/qemu/mips.h +++ b/qemu/mips.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_mips #define tcg_gen_subi_i32 tcg_gen_subi_i32_mips #define tcg_gen_subi_i64 tcg_gen_subi_i64_mips -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_mips #define tcg_gen_xor_i32 tcg_gen_xor_i32_mips #define tcg_gen_xor_i64 tcg_gen_xor_i64_mips #define tcg_gen_xori_i32 tcg_gen_xori_i32_mips diff --git a/qemu/mips64.h b/qemu/mips64.h index 2bdc373a..9042c657 100644 --- a/qemu/mips64.h +++ b/qemu/mips64.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_mips64 #define tcg_gen_subi_i32 tcg_gen_subi_i32_mips64 #define tcg_gen_subi_i64 tcg_gen_subi_i64_mips64 -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_mips64 #define tcg_gen_xor_i32 tcg_gen_xor_i32_mips64 #define tcg_gen_xor_i64 tcg_gen_xor_i64_mips64 #define tcg_gen_xori_i32 tcg_gen_xori_i32_mips64 diff --git a/qemu/mips64el.h b/qemu/mips64el.h index f44e5836..4bcd3785 100644 --- a/qemu/mips64el.h +++ b/qemu/mips64el.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_mips64el #define tcg_gen_subi_i32 tcg_gen_subi_i32_mips64el #define tcg_gen_subi_i64 tcg_gen_subi_i64_mips64el -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_mips64el #define tcg_gen_xor_i32 tcg_gen_xor_i32_mips64el #define tcg_gen_xor_i64 tcg_gen_xor_i64_mips64el #define tcg_gen_xori_i32 tcg_gen_xori_i32_mips64el diff --git a/qemu/mipsel.h b/qemu/mipsel.h index 7ec8957c..f62ba292 100644 --- a/qemu/mipsel.h +++ b/qemu/mipsel.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_mipsel #define tcg_gen_subi_i32 tcg_gen_subi_i32_mipsel #define tcg_gen_subi_i64 tcg_gen_subi_i64_mipsel -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_mipsel #define tcg_gen_xor_i32 tcg_gen_xor_i32_mipsel #define tcg_gen_xor_i64 tcg_gen_xor_i64_mipsel #define tcg_gen_xori_i32 tcg_gen_xori_i32_mipsel diff --git a/qemu/powerpc.h b/qemu/powerpc.h index 4b990da7..32313a71 100644 --- a/qemu/powerpc.h +++ b/qemu/powerpc.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_powerpc #define tcg_gen_subi_i32 tcg_gen_subi_i32_powerpc #define tcg_gen_subi_i64 tcg_gen_subi_i64_powerpc -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_powerpc #define tcg_gen_xor_i32 tcg_gen_xor_i32_powerpc #define tcg_gen_xor_i64 tcg_gen_xor_i64_powerpc #define tcg_gen_xori_i32 tcg_gen_xori_i32_powerpc diff --git a/qemu/sparc.h b/qemu/sparc.h index 1ebf8fac..232154a4 100644 --- a/qemu/sparc.h +++ b/qemu/sparc.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_sparc #define tcg_gen_subi_i32 tcg_gen_subi_i32_sparc #define tcg_gen_subi_i64 tcg_gen_subi_i64_sparc -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_sparc #define tcg_gen_xor_i32 tcg_gen_xor_i32_sparc #define tcg_gen_xor_i64 tcg_gen_xor_i64_sparc #define tcg_gen_xori_i32 tcg_gen_xori_i32_sparc diff --git a/qemu/sparc64.h b/qemu/sparc64.h index 22421f81..8d012e71 100644 --- a/qemu/sparc64.h +++ b/qemu/sparc64.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_sparc64 #define tcg_gen_subi_i32 tcg_gen_subi_i32_sparc64 #define tcg_gen_subi_i64 tcg_gen_subi_i64_sparc64 -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_sparc64 #define tcg_gen_xor_i32 tcg_gen_xor_i32_sparc64 #define tcg_gen_xor_i64 tcg_gen_xor_i64_sparc64 #define tcg_gen_xori_i32 tcg_gen_xori_i32_sparc64 diff --git a/qemu/target-mips/translate.c b/qemu/target-mips/translate.c index 6de24e9e..c7fd0092 100644 --- a/qemu/target-mips/translate.c +++ b/qemu/target-mips/translate.c @@ -16711,7 +16711,7 @@ static void decode_opc_special3_r6(CPUMIPSState *env, DisasContext *ctx) #if defined(TARGET_MIPS64) tcg_gen_ext32s_i64(tcg_ctx, *cpu_gpr[rd], t2); #else - tcg_gen_trunc_i64_i32(tcg_ctx, *cpu_gpr[rd], t2); + tcg_gen_extrl_i64_i32(tcg_ctx, *cpu_gpr[rd], t2); #endif tcg_temp_free_i64(tcg_ctx, t2); tcg_temp_free(tcg_ctx, t1); diff --git a/qemu/x86_64.h b/qemu/x86_64.h index f0a178c4..8c84e419 100644 --- a/qemu/x86_64.h +++ b/qemu/x86_64.h @@ -2846,7 +2846,6 @@ #define tcg_gen_subfi_i64 tcg_gen_subfi_i64_x86_64 #define tcg_gen_subi_i32 tcg_gen_subi_i32_x86_64 #define tcg_gen_subi_i64 tcg_gen_subi_i64_x86_64 -#define tcg_gen_trunc_i64_i32 tcg_gen_trunc_i64_i32_x86_64 #define tcg_gen_xor_i32 tcg_gen_xor_i32_x86_64 #define tcg_gen_xor_i64 tcg_gen_xor_i64_x86_64 #define tcg_gen_xori_i32 tcg_gen_xori_i32_x86_64