riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

linux-user pull request 20210806 

Fix endianness and addresses in i386 linux-user target
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmEM/fASHGxhdXJlbnRA
 dml2aWVyLmV1AAoJEPMMOL0/L748RIQQAJ/h0OQSZqu7X5CERvbrLkzuU8ZmzFmb
 TIBDqzbnM4AhmS3b8j5UEGbZ6UCrnyph+e1Ksf8l9mpmpuDPK178HfKG5NAe7lXY
 x2Y8e2JllZ9ASsRUqqUjnTfXirx5hx5S3V15KVLsdpYq4UG1K07jfh2aqZKijAdi
 zf64ZmMGTMwLO6PdrsDzxM+5fYy5o+ELG4XnHfhH2VsjND6wUSEkouXLVwnxsW3R
 reKFBrzqTX7ryEfAgli4LjdOJ4HPgiMlkQR0boAIYv/lJAc+pSPBO2FxUxJQ+AK/
 KVMjHPbx8aPUC6MADXhjkPdAXotRWX49coQoeR2MRbhIHuLD/JS4frpy5LMNLv8F
 MI+Hx5wCWyyF+V7X1ezkKduN512JPP7tl7EedxEG7OiOkcQuU3ssXbttwZuCf5tz
 dIbUSKUrpYJE+uB91/vL/Fg85c3/i0a7Nl/glzje/IOJ2J4ZSSvVGM9WcC8y5Mbk
 KiEF4jlDrz/lZeNYcVzpYBDzjnVvwIdd9nKYlaJT3VysVjJAxxJkimmK/wqkasEF
 EzmsU0y6pFttsodHm08Mm6U9qQZM6KfyjMOOp9BlUj+S9mv4nMXEOboHHzXUvDCG
 QkSOQqCI7ow6AeEkCeNPuBuGihAfCAdzUlEZNrTwADeEytZ1i7GXWe4mZIDQjrRk
 xTj9ir/H3qmQ
 =I2DD
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.1-pull-request' into staging

linux-user pull request 20210806

Fix endianness and addresses in i386 linux-user target

# gpg: Signature made Fri 06 Aug 2021 10:16:32 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-6.1-pull-request:
  linux-user/elfload: byteswap i386 registers when dumping core
  linux-user: fix guest/host address mixup in i386 setup_rt_frame()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
pull/221/head
Peter Maydell 5 years ago
parent
ca92f16276 030912e01c
commit
dee64246de
2 changed files with 48 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 88
      linux-user/elfload.c
  2. 8
      linux-user/i386/signal.c

88
linux-user/elfload.c
View File

@ -172,33 +172,33 @@ typedef target_elf_greg_t target_elf_gregset_t[ELF_NREG];
*/
static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUX86State *env)
{
(*regs)[0] = env->regs[15];
(*regs)[1] = env->regs[14];
(*regs)[2] = env->regs[13];
(*regs)[3] = env->regs[12];
(*regs)[4] = env->regs[R_EBP];
(*regs)[5] = env->regs[R_EBX];
(*regs)[6] = env->regs[11];
(*regs)[7] = env->regs[10];
(*regs)[8] = env->regs[9];
(*regs)[9] = env->regs[8];
(*regs)[10] = env->regs[R_EAX];
(*regs)[11] = env->regs[R_ECX];
(*regs)[12] = env->regs[R_EDX];
(*regs)[13] = env->regs[R_ESI];
(*regs)[14] = env->regs[R_EDI];
(*regs)[15] = env->regs[R_EAX]; /* XXX */
(*regs)[16] = env->eip;
(*regs)[17] = env->segs[R_CS].selector & 0xffff;
(*regs)[18] = env->eflags;
(*regs)[19] = env->regs[R_ESP];
(*regs)[20] = env->segs[R_SS].selector & 0xffff;
(*regs)[21] = env->segs[R_FS].selector & 0xffff;
(*regs)[22] = env->segs[R_GS].selector & 0xffff;
(*regs)[23] = env->segs[R_DS].selector & 0xffff;
(*regs)[24] = env->segs[R_ES].selector & 0xffff;
(*regs)[25] = env->segs[R_FS].selector & 0xffff;
(*regs)[26] = env->segs[R_GS].selector & 0xffff;
(*regs)[0] = tswapreg(env->regs[15]);
(*regs)[1] = tswapreg(env->regs[14]);
(*regs)[2] = tswapreg(env->regs[13]);
(*regs)[3] = tswapreg(env->regs[12]);
(*regs)[4] = tswapreg(env->regs[R_EBP]);
(*regs)[5] = tswapreg(env->regs[R_EBX]);
(*regs)[6] = tswapreg(env->regs[11]);
(*regs)[7] = tswapreg(env->regs[10]);
(*regs)[8] = tswapreg(env->regs[9]);
(*regs)[9] = tswapreg(env->regs[8]);
(*regs)[10] = tswapreg(env->regs[R_EAX]);
(*regs)[11] = tswapreg(env->regs[R_ECX]);
(*regs)[12] = tswapreg(env->regs[R_EDX]);
(*regs)[13] = tswapreg(env->regs[R_ESI]);
(*regs)[14] = tswapreg(env->regs[R_EDI]);
(*regs)[15] = tswapreg(env->regs[R_EAX]); /* XXX */
(*regs)[16] = tswapreg(env->eip);
(*regs)[17] = tswapreg(env->segs[R_CS].selector & 0xffff);
(*regs)[18] = tswapreg(env->eflags);
(*regs)[19] = tswapreg(env->regs[R_ESP]);
(*regs)[20] = tswapreg(env->segs[R_SS].selector & 0xffff);
(*regs)[21] = tswapreg(env->segs[R_FS].selector & 0xffff);
(*regs)[22] = tswapreg(env->segs[R_GS].selector & 0xffff);
(*regs)[23] = tswapreg(env->segs[R_DS].selector & 0xffff);
(*regs)[24] = tswapreg(env->segs[R_ES].selector & 0xffff);
(*regs)[25] = tswapreg(env->segs[R_FS].selector & 0xffff);
(*regs)[26] = tswapreg(env->segs[R_GS].selector & 0xffff);
}
#else
@ -244,23 +244,23 @@ typedef target_elf_greg_t target_elf_gregset_t[ELF_NREG];
*/
static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUX86State *env)
{
(*regs)[0] = env->regs[R_EBX];
(*regs)[1] = env->regs[R_ECX];
(*regs)[2] = env->regs[R_EDX];
(*regs)[3] = env->regs[R_ESI];
(*regs)[4] = env->regs[R_EDI];
(*regs)[5] = env->regs[R_EBP];
(*regs)[6] = env->regs[R_EAX];
(*regs)[7] = env->segs[R_DS].selector & 0xffff;
(*regs)[8] = env->segs[R_ES].selector & 0xffff;
(*regs)[9] = env->segs[R_FS].selector & 0xffff;
(*regs)[10] = env->segs[R_GS].selector & 0xffff;
(*regs)[11] = env->regs[R_EAX]; /* XXX */
(*regs)[12] = env->eip;
(*regs)[13] = env->segs[R_CS].selector & 0xffff;
(*regs)[14] = env->eflags;
(*regs)[15] = env->regs[R_ESP];
(*regs)[16] = env->segs[R_SS].selector & 0xffff;
(*regs)[0] = tswapreg(env->regs[R_EBX]);
(*regs)[1] = tswapreg(env->regs[R_ECX]);
(*regs)[2] = tswapreg(env->regs[R_EDX]);
(*regs)[3] = tswapreg(env->regs[R_ESI]);
(*regs)[4] = tswapreg(env->regs[R_EDI]);
(*regs)[5] = tswapreg(env->regs[R_EBP]);
(*regs)[6] = tswapreg(env->regs[R_EAX]);
(*regs)[7] = tswapreg(env->segs[R_DS].selector & 0xffff);
(*regs)[8] = tswapreg(env->segs[R_ES].selector & 0xffff);
(*regs)[9] = tswapreg(env->segs[R_FS].selector & 0xffff);
(*regs)[10] = tswapreg(env->segs[R_GS].selector & 0xffff);
(*regs)[11] = tswapreg(env->regs[R_EAX]); /* XXX */
(*regs)[12] = tswapreg(env->eip);
(*regs)[13] = tswapreg(env->segs[R_CS].selector & 0xffff);
(*regs)[14] = tswapreg(env->eflags);
(*regs)[15] = tswapreg(env->regs[R_ESP]);
(*regs)[16] = tswapreg(env->segs[R_SS].selector & 0xffff);
}
#endif

8
linux-user/i386/signal.c
View File

@ -436,13 +436,13 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
#ifndef TARGET_X86_64
env->regs[R_EAX] = sig;
env->regs[R_EDX] = (unsigned long)&frame->info;
env->regs[R_ECX] = (unsigned long)&frame->uc;
env->regs[R_EDX] = frame_addr + offsetof(struct rt_sigframe, info);
env->regs[R_ECX] = frame_addr + offsetof(struct rt_sigframe, uc);
#else
env->regs[R_EAX] = 0;
env->regs[R_EDI] = sig;
env->regs[R_ESI] = (unsigned long)&frame->info;
env->regs[R_EDX] = (unsigned long)&frame->uc;
env->regs[R_ESI] = frame_addr + offsetof(struct rt_sigframe, info);
env->regs[R_EDX] = frame_addr + offsetof(struct rt_sigframe, uc);
#endif
cpu_x86_load_seg(env, R_DS, __USER_DS);

Write Preview
Loading…
Cancel
Save