diff --git a/qemu/aarch64.h b/qemu/aarch64.h index 6db1096f..85f0186a 100644 --- a/qemu/aarch64.h +++ b/qemu/aarch64.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_aarch64 #define print_type_str print_type_str_aarch64 #define probe_access probe_access_aarch64 +#define probe_read probe_read_aarch64 #define probe_write probe_write_aarch64 #define propagateFloat128NaN propagateFloat128NaN_aarch64 #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_aarch64 diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h index 7cf4e034..4a53ae94 100644 --- a/qemu/aarch64eb.h +++ b/qemu/aarch64eb.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_aarch64eb #define print_type_str print_type_str_aarch64eb #define probe_access probe_access_aarch64eb +#define probe_read probe_read_aarch64eb #define probe_write probe_write_aarch64eb #define propagateFloat128NaN propagateFloat128NaN_aarch64eb #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_aarch64eb diff --git a/qemu/arm.h b/qemu/arm.h index 88575100..e86d8096 100644 --- a/qemu/arm.h +++ b/qemu/arm.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_arm #define print_type_str print_type_str_arm #define probe_access probe_access_arm +#define probe_read probe_read_arm #define probe_write probe_write_arm #define propagateFloat128NaN propagateFloat128NaN_arm #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_arm diff --git a/qemu/armeb.h b/qemu/armeb.h index 849c8890..532e4cad 100644 --- a/qemu/armeb.h +++ b/qemu/armeb.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_armeb #define print_type_str print_type_str_armeb #define probe_access probe_access_armeb +#define probe_read probe_read_armeb #define probe_write probe_write_armeb #define propagateFloat128NaN propagateFloat128NaN_armeb #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_armeb diff --git a/qemu/header_gen.py b/qemu/header_gen.py index 073410e1..08c3b4c0 100644 --- a/qemu/header_gen.py +++ b/qemu/header_gen.py @@ -2264,6 +2264,7 @@ symbols = ( 'print_type_size', 'print_type_str', 'probe_access', + 'probe_read', 'probe_write', 'propagateFloat128NaN', 'propagateFloat32MulAddNaN', diff --git a/qemu/include/exec/exec-all.h b/qemu/include/exec/exec-all.h index cf193048..134c7214 100644 --- a/qemu/include/exec/exec-all.h +++ b/qemu/include/exec/exec-all.h @@ -222,6 +222,12 @@ static inline void *probe_write(CPUArchState *env, target_ulong addr, int size, return probe_access(env, addr, size, MMU_DATA_STORE, mmu_idx, retaddr); } +static inline void *probe_read(CPUArchState *env, target_ulong addr, int size, + int mmu_idx, uintptr_t retaddr) +{ + return probe_access(env, addr, size, MMU_DATA_LOAD, mmu_idx, retaddr); +} + #define CODE_GEN_ALIGN 16 /* must be >= of the size of a icache line */ /* Estimated block size for TB allocation. */ diff --git a/qemu/m68k.h b/qemu/m68k.h index 46f5468f..064601ee 100644 --- a/qemu/m68k.h +++ b/qemu/m68k.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_m68k #define print_type_str print_type_str_m68k #define probe_access probe_access_m68k +#define probe_read probe_read_m68k #define probe_write probe_write_m68k #define propagateFloat128NaN propagateFloat128NaN_m68k #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_m68k diff --git a/qemu/mips.h b/qemu/mips.h index 2d2284fa..c39bd536 100644 --- a/qemu/mips.h +++ b/qemu/mips.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_mips #define print_type_str print_type_str_mips #define probe_access probe_access_mips +#define probe_read probe_read_mips #define probe_write probe_write_mips #define propagateFloat128NaN propagateFloat128NaN_mips #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_mips diff --git a/qemu/mips64.h b/qemu/mips64.h index ef16f6bd..b8f1bf87 100644 --- a/qemu/mips64.h +++ b/qemu/mips64.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_mips64 #define print_type_str print_type_str_mips64 #define probe_access probe_access_mips64 +#define probe_read probe_read_mips64 #define probe_write probe_write_mips64 #define propagateFloat128NaN propagateFloat128NaN_mips64 #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_mips64 diff --git a/qemu/mips64el.h b/qemu/mips64el.h index 4a3e9d2b..4bc359b9 100644 --- a/qemu/mips64el.h +++ b/qemu/mips64el.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_mips64el #define print_type_str print_type_str_mips64el #define probe_access probe_access_mips64el +#define probe_read probe_read_mips64el #define probe_write probe_write_mips64el #define propagateFloat128NaN propagateFloat128NaN_mips64el #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_mips64el diff --git a/qemu/mipsel.h b/qemu/mipsel.h index 4db4a8cf..b6bdbc28 100644 --- a/qemu/mipsel.h +++ b/qemu/mipsel.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_mipsel #define print_type_str print_type_str_mipsel #define probe_access probe_access_mipsel +#define probe_read probe_read_mipsel #define probe_write probe_write_mipsel #define propagateFloat128NaN propagateFloat128NaN_mipsel #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_mipsel diff --git a/qemu/powerpc.h b/qemu/powerpc.h index 94ff746e..75fd4d97 100644 --- a/qemu/powerpc.h +++ b/qemu/powerpc.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_powerpc #define print_type_str print_type_str_powerpc #define probe_access probe_access_powerpc +#define probe_read probe_read_powerpc #define probe_write probe_write_powerpc #define propagateFloat128NaN propagateFloat128NaN_powerpc #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_powerpc diff --git a/qemu/riscv32.h b/qemu/riscv32.h index 3806e2f8..8ec16e59 100644 --- a/qemu/riscv32.h +++ b/qemu/riscv32.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_riscv32 #define print_type_str print_type_str_riscv32 #define probe_access probe_access_riscv32 +#define probe_read probe_read_riscv32 #define probe_write probe_write_riscv32 #define propagateFloat128NaN propagateFloat128NaN_riscv32 #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_riscv32 diff --git a/qemu/riscv64.h b/qemu/riscv64.h index 7b0cafbb..1428708d 100644 --- a/qemu/riscv64.h +++ b/qemu/riscv64.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_riscv64 #define print_type_str print_type_str_riscv64 #define probe_access probe_access_riscv64 +#define probe_read probe_read_riscv64 #define probe_write probe_write_riscv64 #define propagateFloat128NaN propagateFloat128NaN_riscv64 #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_riscv64 diff --git a/qemu/sparc.h b/qemu/sparc.h index d7a4e3f6..b9281093 100644 --- a/qemu/sparc.h +++ b/qemu/sparc.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_sparc #define print_type_str print_type_str_sparc #define probe_access probe_access_sparc +#define probe_read probe_read_sparc #define probe_write probe_write_sparc #define propagateFloat128NaN propagateFloat128NaN_sparc #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_sparc diff --git a/qemu/sparc64.h b/qemu/sparc64.h index cf6c458f..8497c938 100644 --- a/qemu/sparc64.h +++ b/qemu/sparc64.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_sparc64 #define print_type_str print_type_str_sparc64 #define probe_access probe_access_sparc64 +#define probe_read probe_read_sparc64 #define probe_write probe_write_sparc64 #define propagateFloat128NaN propagateFloat128NaN_sparc64 #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_sparc64 diff --git a/qemu/x86_64.h b/qemu/x86_64.h index 616b9508..2898138b 100644 --- a/qemu/x86_64.h +++ b/qemu/x86_64.h @@ -2258,6 +2258,7 @@ #define print_type_size print_type_size_x86_64 #define print_type_str print_type_str_x86_64 #define probe_access probe_access_x86_64 +#define probe_read probe_read_x86_64 #define probe_write probe_write_x86_64 #define propagateFloat128NaN propagateFloat128NaN_x86_64 #define propagateFloat32MulAddNaN propagateFloat32MulAddNaN_x86_64