Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some special NOPs to help qemu. 

thanks to Helge Deller for the heads-up.
This commit is contained in:
skrll 2022-05-14 06:07:53 +00:00
parent bbf56d84ab
commit ae907af48b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/hppa/hppa/idle_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: idle_machdep.c,v 1.3 2019/04/15 20:45:08 skrll Exp $ */
/* $NetBSD: idle_machdep.c,v 1.4 2022/05/14 06:07:53 skrll Exp $ */
/*
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@ -28,7 +28,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: idle_machdep.c,v 1.3 2019/04/15 20:45:08 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: idle_machdep.c,v 1.4 2022/05/14 06:07:53 skrll Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@ -36,5 +36,8 @@ __KERNEL_RCSID(0, "$NetBSD: idle_machdep.c,v 1.3 2019/04/15 20:45:08 skrll Exp $
void
cpu_idle(void)
{
/* do nothing */
/*
* This NOP instruction is used by qemu to detect the idle loop.
*/
__asm volatile("or %%r10,%%r10,%%r10" ::: "memory");
}

13
sys/arch/hppa/hppa/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.16 2020/09/14 16:11:32 skrll Exp $ */
/* $NetBSD: machdep.c,v 1.17 2022/05/14 06:07:53 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2020/09/14 16:11:32 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2022/05/14 06:07:53 skrll Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@ -1447,8 +1447,13 @@ cpu_reboot(int howto, char *user_boot_string)
:: "r" (CMD_RESET), "r" (HPPA_LBCAST + iomod_command));
}
for (;;)
/* loop while bus reset is coming up */ ;
for (;;) {
/*
* loop while bus reset is coming up. This NOP instruction
* is used by qemu to detect the 'death loop'.
*/
__asm volatile("or %%r31, %%r31, %%r31" ::: "memory");
}
/* NOTREACHED */
}