Skip to content

Commit

Permalink
linux-user/loongarch64: Use abi_{ulong,uint} types
Browse files Browse the repository at this point in the history
Signed-off-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20231101030816.2353416-5-gaosong@loongson.cn>
  • Loading branch information
gaosong-loongson committed Nov 3, 2023
1 parent 01714ed commit 7c0ea81
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions linux-user/loongarch64/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#define SC_USED_FP (1 << 0)

struct target_sigcontext {
uint64_t sc_pc;
uint64_t sc_regs[32];
uint32_t sc_flags;
uint64_t sc_extcontext[0] QEMU_ALIGNED(16);
abi_ulong sc_pc;
abi_ulong sc_regs[32];
abi_uint sc_flags;
abi_ulong sc_extcontext[0] QEMU_ALIGNED(16);
};

QEMU_BUILD_BUG_ON(sizeof(struct target_sigcontext) != sizeof_sigcontext);
Expand All @@ -33,19 +33,19 @@ QEMU_BUILD_BUG_ON(offsetof(struct target_sigcontext, sc_regs)
#define FPU_CTX_MAGIC 0x46505501
#define FPU_CTX_ALIGN 8
struct target_fpu_context {
uint64_t regs[32];
uint64_t fcc;
uint32_t fcsr;
abi_ulong regs[32];
abi_ulong fcc;
abi_uint fcsr;
} QEMU_ALIGNED(FPU_CTX_ALIGN);

QEMU_BUILD_BUG_ON(offsetof(struct target_fpu_context, regs)
!= offsetof_fpucontext_fr);

#define CONTEXT_INFO_ALIGN 16
struct target_sctx_info {
uint32_t magic;
uint32_t size;
uint64_t padding;
abi_uint magic;
abi_uint size;
abi_ulong padding;
} QEMU_ALIGNED(CONTEXT_INFO_ALIGN);

QEMU_BUILD_BUG_ON(sizeof(struct target_sctx_info) != sizeof_sctx_info);
Expand Down Expand Up @@ -162,7 +162,7 @@ static bool parse_extcontext(struct extctx_layout *extctx, abi_ptr frame)
memset(extctx, 0, sizeof(*extctx));

while (1) {
uint32_t magic, size;
abi_uint magic, size;

if (get_user_u32(magic, frame) || get_user_u32(size, frame + 4)) {
return false;
Expand Down Expand Up @@ -206,7 +206,7 @@ static void restore_sigframe(CPULoongArchState *env,
if (extctx->fpu.haddr) {
struct target_fpu_context *fpu_ctx =
extctx->fpu.haddr + sizeof(struct target_sctx_info);
uint64_t fcc;
abi_ulong fcc;

for (i = 0; i < 32; ++i) {
__get_user(env->fpr[i].vreg.D(0), &fpu_ctx->regs[i]);
Expand Down

0 comments on commit 7c0ea81

Please sign in to comment.