[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v2 2/4] ppc64-dump: Support dump for little endian ppc
From: |
Greg Kurz |
Subject: |
[Qemu-ppc] [PATCH v2 2/4] ppc64-dump: Support dump for little endian ppc64 |
Date: |
Wed, 30 Apr 2014 16:15:25 +0200 |
User-agent: |
StGit/0.16 |
From: Bharata B Rao <address@hidden>
Fix ppc64 arch specific dump code to work correctly for little endian
guests.
We introduce a NoteFuncArg type to avoid adding extra arguments to all note
functions.
Signed-off-by: Bharata B Rao <address@hidden>
[ rebased on top of current master branch,
added dump_ prefix and pass a DumpState * argument to helpers,
introduced NoteFuncArg,
Greg Kurz <address@hidden> ]
Signed-off-by: Greg Kurz <address@hidden>
---
Changes for v2:
- added dump_ prefix and pass a DumpState * argument to helpers
- introduced NoteFuncArg
target-ppc/arch_dump.c | 86 ++++++++++++++++++++++++++++++------------------
1 file changed, 53 insertions(+), 33 deletions(-)
diff --git a/target-ppc/arch_dump.c b/target-ppc/arch_dump.c
index 9dccf1a..f24290f 100644
--- a/target-ppc/arch_dump.c
+++ b/target-ppc/arch_dump.c
@@ -79,94 +79,111 @@ typedef struct noteStruct {
} contents;
} QEMU_PACKED Note;
+typedef struct NoteFuncArg {
+ Note note;
+ DumpState *state;
+} NoteFuncArg;
-static void ppc64_write_elf64_prstatus(Note *note, PowerPCCPU *cpu)
+static void ppc64_write_elf64_prstatus(NoteFuncArg *arg, PowerPCCPU *cpu)
{
int i;
uint64_t cr;
struct PPC64ElfPrstatus *prstatus;
struct PPC64UserRegStruct *reg;
+ Note *note = &arg->note;
+ DumpState *s = arg->state;
- note->hdr.n_type = cpu_to_be32(NT_PRSTATUS);
+ note->hdr.n_type = dump_cpu_convert_to_target32(s, NT_PRSTATUS);
prstatus = ¬e->contents.prstatus;
memset(prstatus, 0, sizeof(*prstatus));
reg = &prstatus->pr_reg;
for (i = 0; i < 32; i++) {
- reg->gpr[i] = cpu_to_be64(cpu->env.gpr[i]);
+ reg->gpr[i] = dump_cpu_convert_to_target64(s, cpu->env.gpr[i]);
}
- reg->nip = cpu_to_be64(cpu->env.nip);
- reg->msr = cpu_to_be64(cpu->env.msr);
- reg->ctr = cpu_to_be64(cpu->env.ctr);
- reg->link = cpu_to_be64(cpu->env.lr);
- reg->xer = cpu_to_be64(cpu_read_xer(&cpu->env));
+ reg->nip = dump_cpu_convert_to_target64(s, cpu->env.nip);
+ reg->msr = dump_cpu_convert_to_target64(s, cpu->env.msr);
+ reg->ctr = dump_cpu_convert_to_target64(s, cpu->env.ctr);
+ reg->link = dump_cpu_convert_to_target64(s, cpu->env.lr);
+ reg->xer = dump_cpu_convert_to_target64(s, cpu_read_xer(&cpu->env));
cr = 0;
for (i = 0; i < 8; i++) {
cr |= (cpu->env.crf[i] & 15) << (4 * (7 - i));
}
- reg->ccr = cpu_to_be64(cr);
+ reg->ccr = dump_cpu_convert_to_target64(s, cr);
}
-static void ppc64_write_elf64_fpregset(Note *note, PowerPCCPU *cpu)
+static void ppc64_write_elf64_fpregset(NoteFuncArg *arg, PowerPCCPU *cpu)
{
int i;
struct PPC64ElfFpregset *fpregset;
+ Note *note = &arg->note;
+ DumpState *s = arg->state;
- note->hdr.n_type = cpu_to_be32(NT_PRFPREG);
+ note->hdr.n_type = dump_cpu_convert_to_target32(s, NT_PRFPREG);
fpregset = ¬e->contents.fpregset;
memset(fpregset, 0, sizeof(*fpregset));
for (i = 0; i < 32; i++) {
- fpregset->fpr[i] = cpu_to_be64(cpu->env.fpr[i]);
+ fpregset->fpr[i] = dump_cpu_convert_to_target64(s, cpu->env.fpr[i]);
}
- fpregset->fpscr = cpu_to_be64(cpu->env.fpscr);
+ fpregset->fpscr = dump_cpu_convert_to_target64(s, cpu->env.fpscr);
}
-static void ppc64_write_elf64_vmxregset(Note *note, PowerPCCPU *cpu)
+static void ppc64_write_elf64_vmxregset(NoteFuncArg *arg, PowerPCCPU *cpu)
{
int i;
struct PPC64ElfVmxregset *vmxregset;
+ Note *note = &arg->note;
+ DumpState *s = arg->state;
- note->hdr.n_type = cpu_to_be32(NT_PPC_VMX);
+ note->hdr.n_type = dump_cpu_convert_to_target32(s, NT_PPC_VMX);
vmxregset = ¬e->contents.vmxregset;
memset(vmxregset, 0, sizeof(*vmxregset));
for (i = 0; i < 32; i++) {
- vmxregset->avr[i].u64[0] = cpu_to_be64(cpu->env.avr[i].u64[0]);
- vmxregset->avr[i].u64[1] = cpu_to_be64(cpu->env.avr[i].u64[1]);
+ vmxregset->avr[i].u64[0] =
+ dump_cpu_convert_to_target64(s, cpu->env.avr[i].u64[0]);
+ vmxregset->avr[i].u64[1] =
+ dump_cpu_convert_to_target64(s, cpu->env.avr[i].u64[1]);
}
- vmxregset->vscr.u32[3] = cpu_to_be32(cpu->env.vscr);
+ vmxregset->vscr.u32[3] = dump_cpu_convert_to_target32(s, cpu->env.vscr);
}
-static void ppc64_write_elf64_vsxregset(Note *note, PowerPCCPU *cpu)
+static void ppc64_write_elf64_vsxregset(NoteFuncArg *arg, PowerPCCPU *cpu)
{
int i;
struct PPC64ElfVsxregset *vsxregset;
+ Note *note = &arg->note;
+ DumpState *s = arg->state;
- note->hdr.n_type = cpu_to_be32(NT_PPC_VSX);
+ note->hdr.n_type = dump_cpu_convert_to_target32(s, NT_PPC_VSX);
vsxregset = ¬e->contents.vsxregset;
memset(vsxregset, 0, sizeof(*vsxregset));
for (i = 0; i < 32; i++) {
- vsxregset->vsr[i] = cpu_to_be64(cpu->env.vsr[i]);
+ vsxregset->vsr[i] = dump_cpu_convert_to_target64(s, cpu->env.vsr[i]);
}
}
-static void ppc64_write_elf64_speregset(Note *note, PowerPCCPU *cpu)
+static void ppc64_write_elf64_speregset(NoteFuncArg *arg, PowerPCCPU *cpu)
{
struct PPC64ElfSperegset *speregset;
- note->hdr.n_type = cpu_to_be32(NT_PPC_SPE);
+ Note *note = &arg->note;
+ DumpState *s = arg->state;
+
+ note->hdr.n_type = dump_cpu_convert_to_target32(s, NT_PPC_SPE);
speregset = ¬e->contents.speregset;
memset(speregset, 0, sizeof(*speregset));
- speregset->spe_acc = cpu_to_be64(cpu->env.spe_acc);
- speregset->spe_fscr = cpu_to_be32(cpu->env.spe_fscr);
+ speregset->spe_acc = dump_cpu_convert_to_target64(s, cpu->env.spe_acc);
+ speregset->spe_fscr = dump_cpu_convert_to_target32(s, cpu->env.spe_fscr);
}
static const struct NoteFuncDescStruct {
int contents_size;
- void (*note_contents_func)(Note *note, PowerPCCPU *cpu);
+ void (*note_contents_func)(NoteFuncArg *arg, PowerPCCPU *cpu);
} note_func[] = {
{sizeof(((Note *)0)->contents.prstatus), ppc64_write_elf64_prstatus},
{sizeof(((Note *)0)->contents.fpregset), ppc64_write_elf64_fpregset},
@@ -218,20 +235,23 @@ static int ppc64_write_all_elf64_notes(const char
*note_name,
PowerPCCPU *cpu, int id,
void *opaque)
{
- Note note;
+ NoteFuncArg arg = { .state = opaque };
int ret = -1;
int note_size;
const NoteFuncDesc *nf;
for (nf = note_func; nf->note_contents_func; nf++) {
- note.hdr.n_namesz = cpu_to_be32(sizeof(note.name));
- note.hdr.n_descsz = cpu_to_be32(nf->contents_size);
- strncpy(note.name, note_name, sizeof(note.name));
+ arg.note.hdr.n_namesz =
+ dump_cpu_convert_to_target32(opaque, sizeof(arg.note.name));
+ arg.note.hdr.n_descsz =
+ dump_cpu_convert_to_target32(opaque, nf->contents_size);
+ strncpy(arg.note.name, note_name, sizeof(arg.note.name));
- (*nf->note_contents_func)(¬e, cpu);
+ (*nf->note_contents_func)(&arg, cpu);
- note_size = sizeof(note) - sizeof(note.contents) + nf->contents_size;
- ret = f(¬e, note_size, opaque);
+ note_size =
+ sizeof(arg.note) - sizeof(arg.note.contents) + nf->contents_size;
+ ret = f(&arg.note, note_size, opaque);
if (ret < 0) {
return -1;
}