mirror of https://github.com/xemu-project/xemu.git
* fix --static compilation of hexagon
* fix incorrect application of REX to MMX operands * fix crash on module load * update Italian translation -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAma7kZ4UHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroOy7QgAriuxfgw3Yvu9UPPfEZT5V9p5XfDf LceO3C6OABIkFoGSO8WK5dWfQy3oYbrwEXX/l/PW1lUc2DFrSUo9YtIfjelRkxoC 0EAAbV5A+xCLYmujFqBSe/6usRj82uKjSET1KK1aCam7ONZLNZf2yb4OwdShvLSN MPgtBOrwznR1qh3KJtLB6YSRC0Rie1hOxbXFpx1AklXYnIiqUdMjXOHSjs+Amva0 VczuqwjtVdNDTPqbZlCXatPtZ8nwYeEOD2jOqgjAoEwwabZ1fFGDCNXlqEDLSdTm Cc+IZPYU5a8+tVfH0DYEMgMSkRhDUqVZ/076L+pRi+Q8ClxWV8fKsf5qKw== =jJtu -----END PGP SIGNATURE----- Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging * fix --static compilation of hexagon * fix incorrect application of REX to MMX operands * fix crash on module load * update Italian translation # -----BEGIN PGP SIGNATURE----- # # iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAma7kZ4UHHBib256aW5p # QHJlZGhhdC5jb20ACgkQv/vSX3jHroOy7QgAriuxfgw3Yvu9UPPfEZT5V9p5XfDf # LceO3C6OABIkFoGSO8WK5dWfQy3oYbrwEXX/l/PW1lUc2DFrSUo9YtIfjelRkxoC # 0EAAbV5A+xCLYmujFqBSe/6usRj82uKjSET1KK1aCam7ONZLNZf2yb4OwdShvLSN # MPgtBOrwznR1qh3KJtLB6YSRC0Rie1hOxbXFpx1AklXYnIiqUdMjXOHSjs+Amva0 # VczuqwjtVdNDTPqbZlCXatPtZ8nwYeEOD2jOqgjAoEwwabZ1fFGDCNXlqEDLSdTm # Cc+IZPYU5a8+tVfH0DYEMgMSkRhDUqVZ/076L+pRi+Q8ClxWV8fKsf5qKw== # =jJtu # -----END PGP SIGNATURE----- # gpg: Signature made Wed 14 Aug 2024 03:02:22 AM AEST # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] * tag 'for-upstream' of https://gitlab.com/bonzini/qemu: po: update Italian translation module: Prevent crash by resetting local_err in module_load_qom_all() target/i386: Assert MMX and XMM registers in range target/i386: Use unit not type in decode_modrm target/i386: Do not apply REX to MMX operands target/hexagon: don't look for static glib Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
commit
a733f37aef
2
po/it.po
2
po/it.po
|
@ -65,7 +65,7 @@ msgid "Detach Tab"
|
||||||
msgstr "_Sposta in una nuova finestra"
|
msgstr "_Sposta in una nuova finestra"
|
||||||
|
|
||||||
msgid "Show Menubar"
|
msgid "Show Menubar"
|
||||||
msgstr ""
|
msgstr "Mostra _barra dei menu"
|
||||||
|
|
||||||
msgid "_Machine"
|
msgid "_Machine"
|
||||||
msgstr "_Macchina virtuale"
|
msgstr "_Macchina virtuale"
|
||||||
|
|
|
@ -300,7 +300,7 @@ if idef_parser_enabled and 'hexagon-linux-user' in target_dirs
|
||||||
arguments: ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@']
|
arguments: ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@']
|
||||||
)
|
)
|
||||||
|
|
||||||
glib_dep = dependency('glib-2.0', native: true)
|
glib_dep = dependency('glib-2.0', native: true, static: false)
|
||||||
|
|
||||||
idef_parser = executable(
|
idef_parser = executable(
|
||||||
'idef-parser',
|
'idef-parser',
|
||||||
|
|
|
@ -1799,13 +1799,13 @@ static void decode_root(DisasContext *s, CPUX86State *env, X86OpEntry *entry, ui
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int decode_modrm(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode,
|
static int decode_modrm(DisasContext *s, CPUX86State *env,
|
||||||
X86DecodedOp *op, X86OpType type)
|
X86DecodedInsn *decode, X86DecodedOp *op)
|
||||||
{
|
{
|
||||||
int modrm = get_modrm(s, env);
|
int modrm = get_modrm(s, env);
|
||||||
if ((modrm >> 6) == 3) {
|
if ((modrm >> 6) == 3) {
|
||||||
op->n = (modrm & 7);
|
op->n = (modrm & 7);
|
||||||
if (type != X86_TYPE_Q && type != X86_TYPE_N) {
|
if (op->unit != X86_OP_MMX) {
|
||||||
op->n |= REX_B(s);
|
op->n |= REX_B(s);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -1979,7 +1979,10 @@ static bool decode_op(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode,
|
||||||
op->unit = X86_OP_SSE;
|
op->unit = X86_OP_SSE;
|
||||||
}
|
}
|
||||||
get_reg:
|
get_reg:
|
||||||
op->n = ((get_modrm(s, env) >> 3) & 7) | REX_R(s);
|
op->n = ((get_modrm(s, env) >> 3) & 7);
|
||||||
|
if (op->unit != X86_OP_MMX) {
|
||||||
|
op->n |= REX_R(s);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case X86_TYPE_E: /* ALU modrm operand */
|
case X86_TYPE_E: /* ALU modrm operand */
|
||||||
|
@ -2037,7 +2040,7 @@ static bool decode_op(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode,
|
||||||
/* fall through */
|
/* fall through */
|
||||||
case X86_TYPE_nop: /* modrm operand decoded but not fetched */
|
case X86_TYPE_nop: /* modrm operand decoded but not fetched */
|
||||||
get_modrm:
|
get_modrm:
|
||||||
decode_modrm(s, env, decode, op, type);
|
decode_modrm(s, env, decode, op);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case X86_TYPE_O: /* Absolute address encoded in the instruction */
|
case X86_TYPE_O: /* Absolute address encoded in the instruction */
|
||||||
|
|
|
@ -33,8 +33,13 @@
|
||||||
#define TCG_TARGET_extract_tl_valid TCG_TARGET_extract_i32_valid
|
#define TCG_TARGET_extract_tl_valid TCG_TARGET_extract_i32_valid
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define MMX_OFFSET(reg) \
|
||||||
|
({ assert((reg) >= 0 && (reg) <= 7); \
|
||||||
|
offsetof(CPUX86State, fpregs[reg].mmx); })
|
||||||
|
|
||||||
#define ZMM_OFFSET(reg) offsetof(CPUX86State, xmm_regs[reg])
|
#define ZMM_OFFSET(reg) \
|
||||||
|
({ assert((reg) >= 0 && (reg) <= 15); \
|
||||||
|
offsetof(CPUX86State, xmm_regs[reg]); })
|
||||||
|
|
||||||
typedef void (*SSEFunc_i_ep)(TCGv_i32 val, TCGv_ptr env, TCGv_ptr reg);
|
typedef void (*SSEFunc_i_ep)(TCGv_i32 val, TCGv_ptr env, TCGv_ptr reg);
|
||||||
typedef void (*SSEFunc_l_ep)(TCGv_i64 val, TCGv_ptr env, TCGv_ptr reg);
|
typedef void (*SSEFunc_l_ep)(TCGv_i64 val, TCGv_ptr env, TCGv_ptr reg);
|
||||||
|
@ -168,7 +173,7 @@ static int vector_elem_offset(X86DecodedOp *op, MemOp ot, int n)
|
||||||
static void compute_mmx_offset(X86DecodedOp *op)
|
static void compute_mmx_offset(X86DecodedOp *op)
|
||||||
{
|
{
|
||||||
if (!op->has_ea) {
|
if (!op->has_ea) {
|
||||||
op->offset = offsetof(CPUX86State, fpregs[op->n].mmx) + mmx_offset(op->ot);
|
op->offset = MMX_OFFSET(op->n) + mmx_offset(op->ot);
|
||||||
} else {
|
} else {
|
||||||
op->offset = offsetof(CPUX86State, mmx_t0) + mmx_offset(op->ot);
|
op->offset = offsetof(CPUX86State, mmx_t0) + mmx_offset(op->ot);
|
||||||
}
|
}
|
||||||
|
|
|
@ -354,13 +354,13 @@ int module_load_qom(const char *type, Error **errp)
|
||||||
void module_load_qom_all(void)
|
void module_load_qom_all(void)
|
||||||
{
|
{
|
||||||
const QemuModinfo *modinfo;
|
const QemuModinfo *modinfo;
|
||||||
Error *local_err = NULL;
|
|
||||||
|
|
||||||
if (module_loaded_qom_all) {
|
if (module_loaded_qom_all) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (modinfo = module_info; modinfo->name != NULL; modinfo++) {
|
for (modinfo = module_info; modinfo->name != NULL; modinfo++) {
|
||||||
|
Error *local_err = NULL;
|
||||||
if (!modinfo->objs) {
|
if (!modinfo->objs) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue