Skip to content

mips, i386, loongarch: tighten Penguin hypercall match #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lacraig2 merged 2 commits into from
May 27, 2026
Merged

mips, i386, loongarch: tighten Penguin hypercall match #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d98fee
mips: tighten Penguin hypercall match
lacraig2 May 27, 2026
a3734fe
penguin: tighten remaining hypercall matches
lacraig2 May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hw/i386/pc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ static void ioport88_write(void *opaque, hwaddr addr, uint64_t data,
CPUX86State *env;
uint64_t ret = 0;

if (!cs || qtest_enabled()) {
if (size != 4 || !cs || qtest_enabled()) {
return;
}

Expand Down
8 changes: 4 additions & 4 deletions target/i386/kvm/kvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6564,12 +6564,12 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)

switch (run->exit_reason) {
case KVM_EXIT_IO:
if (run->io.port == 0x88 && run->io.direction == KVM_EXIT_IO_OUT) {
if (run->io.port == 0x88 &&
run->io.direction == KVM_EXIT_IO_OUT &&
run->io.size == 4) {
uint64_t nr = 0;

if (run->io.size == 4) {
nr = *(uint32_t *)((uint8_t *)run + run->io.data_offset);
}
nr = *(uint32_t *)((uint8_t *)run + run->io.data_offset);

CPUX86State *env;
uint64_t ret_val = 0;
Expand Down
2 changes: 1 addition & 1 deletion target/loongarch/tcg/insn_trans/trans_extra.c.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static bool trans_cpucfg(DisasContext *ctx, arg_cpucfg *a)

gen_helper_cpucfg(dest, tcg_env, src1);
gen_set_gpr(a->rd, dest, EXT_NONE);
if (a->rd == 0) {
if (a->rd == 0 && a->rj == 0) {
TCGv ret = tcg_temp_new();
gen_helper_penguin_guest_hypercall(ret, tcg_env,
gpr_src(ctx, 11, EXT_NONE),
Expand Down
9 changes: 1 addition & 8 deletions target/mips/tcg/translate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2722,7 +2722,7 @@ static void gen_cond_move(DisasContext *ctx, uint32_t opc,
{
TCGv t0, t1, t2;

if (rd == 0) {
if (opc == OPC_MOVZ && rd == 0 && rs == 0 && rt == 0) {
gen_helper_penguin_guest_hypercall(cpu_gpr[2], tcg_env,
cpu_gpr[2], cpu_gpr[4],
cpu_gpr[5], cpu_gpr[6],
Expand Down Expand Up @@ -8521,13 +8521,6 @@ static void gen_cp0(CPUMIPSState *env, DisasContext *ctx, uint32_t opc,
check_cp0_enabled(ctx);
switch (opc) {
case OPC_MFC0:
if (rt == 0) {
gen_helper_penguin_guest_hypercall(cpu_gpr[2], tcg_env,
cpu_gpr[2], cpu_gpr[4],
cpu_gpr[5], cpu_gpr[6],
cpu_gpr[7], tcg_constant_tl(0));
return;
}
gen_mfc0(ctx, cpu_gpr[rt], rd, ctx->opcode & 0x7);
opn = "mfc0";
break;
Expand Down
Loading