From ae8d2f526e6b6c8aee5e2e126dfc50b067922fc9 Mon Sep 17 00:00:00 2001 From: "Charles.Forsyth" Date: Wed, 19 Nov 2008 01:52:07 +0000 Subject: 20081119-0151 --- CHANGES | 2 ++ include/version.h | 2 +- os/pc/fns.h | 2 +- os/pc/main.c | 11 +++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index a3af64dd..92f76fc8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +20081119 + os/pc/^(main.c fns.h) more idle idlehands 20081112 emu/Linux/asm-arm.S old failure to use different regs for swp finally changed here libmath/blas.c compensate for gcc bug on arm diff --git a/include/version.h b/include/version.h index 923af68e..eaf0f8ac 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20081112)" +#define VERSION "Fourth Edition (20081119)" diff --git a/os/pc/fns.h b/os/pc/fns.h index d4b61034..de8cfbe1 100644 --- a/os/pc/fns.h +++ b/os/pc/fns.h @@ -48,7 +48,7 @@ int i8259enable(Vctl*); int i8259vecno(int); int i8259disable(int); void idle(void); -#define idlehands() /* nothing to do in the runproc */ +void idlehands(void); int inb(int); void insb(int, void*, int); ushort ins(int); diff --git a/os/pc/main.c b/os/pc/main.c index df4f240e..11e8d4db 100644 --- a/os/pc/main.c +++ b/os/pc/main.c @@ -455,3 +455,14 @@ isaconfig(char *class, int ctlrno, ISAConf *isa) } return 1; } + +/* + * put the processor in the halt state if we've no processes to run. + * an interrupt will get us going again. + */ +void +idlehands(void) +{ + if(conf.nmach == 1) + halt(); +} -- cgit v1.2.3