summaryrefslogtreecommitdiff
path: root/emu/NetBSD/os.c
diff options
context:
space:
mode:
Diffstat (limited to 'emu/NetBSD/os.c')
-rw-r--r--emu/NetBSD/os.c300
1 files changed, 37 insertions, 263 deletions
diff --git a/emu/NetBSD/os.c b/emu/NetBSD/os.c
index b6ffab99..8ffce24e 100644
--- a/emu/NetBSD/os.c
+++ b/emu/NetBSD/os.c
@@ -13,6 +13,8 @@
#include "fns.h"
#include "error.h"
+#include "raise.h"
+
/* For dynamic linking init/fini code that needs malloc */
void (*coherence)(void) = nofence;
@@ -21,16 +23,9 @@ enum
{
DELETE = 0x7f,
CTRLC = 'C'-'@',
- NSTACKSPERALLOC = 16,
- X11STACK= 256*1024
};
char *hosttype = "NetBSD";
-static void *stackalloc(Proc *p, void **tos);
-static void stackfreeandexit(void *stack);
-
-void executeonnewstack(void *tos, void (*tramp)(void *arg), void *arg);
-void unlockandexit(ulong *key);
extern int dflag;
@@ -38,163 +33,49 @@ int gidnobody = -1;
int uidnobody = -1;
static struct termios tinit;
-void
-pexit(char *msg, int t)
-{
- Osenv *e;
- void *kstack;
-
- lock(&procs.l);
- if(up->prev)
- up->prev->next = up->next;
- else
- procs.head = up->next;
-
- if(up->next)
- up->next->prev = up->prev;
- else
- procs.tail = up->prev;
- unlock(&procs.l);
-
- if(0)
- print("pexit: %s: %s\n", up->text, msg);
-
- e = up->env;
- if(e != nil) {
- closefgrp(e->fgrp);
- closepgrp(e->pgrp);
- closeegrp(e->egrp);
- closesigs(e->sigs);
- }
- kstack = up->kstack;
- free(up->prog);
- free(up);
- if(kstack != nil)
- stackfreeandexit(kstack);
-}
-
-int
-tramp(void *arg)
-{
- Proc *p;
- p = arg;
- p->pid = p->sigid = getpid();
- (*p->func)(p->arg);
- pexit("{Tramp}", 0);
- return 0;
-}
-
-void
-kproc(char *name, void (*func)(void*), void *arg, int flags)
-{
- int pid;
- Proc *p;
- Pgrp *pg;
- Fgrp *fg;
- Egrp *eg;
- void *tos;
-
- p = newproc();
- if(0)
- print("start %s:%.8lx\n", name, p);
- if(p == nil) {
- print("kproc(%s): no memory", name);
- panic("kproc: no memory");
- }
-
- if(flags & KPDUPPG) {
- pg = up->env->pgrp;
- incref(&pg->r);
- p->env->pgrp = pg;
- }
- if(flags & KPDUPFDG) {
- fg = up->env->fgrp;
- incref(&fg->r);
- p->env->fgrp = fg;
- }
- if(flags & KPDUPENVG) {
- eg = up->env->egrp;
- incref(&eg->r);
- p->env->egrp = eg;
- }
-
- p->env->uid = up->env->uid;
- p->env->gid = up->env->gid;
- kstrdup(&p->env->user, up->env->user);
-
- strcpy(p->text, name);
-
- p->func = func;
- p->arg = arg;
-
- if(flags & KPX11){
- p->kstack = nil; /* never freed; also up not defined */
- tos = (char*)mallocz(X11STACK, 0) + X11STACK - sizeof(void*);
- }else
- p->kstack = stackalloc(p, &tos);
-
- lock(&procs.l);
- if(procs.tail != nil) {
- p->prev = procs.tail;
- procs.tail->next = p;
- }
- else {
- procs.head = p;
- p->prev = nil;
- }
- procs.tail = p;
- unlock(&procs.l);
-
- if (__clone(tramp, tos, /*CLONE_PTRACE|*/CLONE_VM|CLONE_FS|CLONE_FILES|SIGCHLD, p) <= 0) {
- fprint(2, "emu: clone failed: %s\n", strerror(errno));
- panic("kproc: clone failed");
- }
-}
-
-/*
- * TO DO:
- * To get pc on trap, use sigaction instead of signal and
- * examine its siginfo structure
- */
-
-/*
static void
-diserr(char *s, int pc)
+sysfault(char *what, void *addr)
{
- char buf[ERRMAX];
+ char buf[64];
- snprint(buf, sizeof(buf), "%s: pc=0x%lux", s, pc);
+ snprint(buf, sizeof(buf), "sys: %s%#p", what, addr);
disfault(nil, buf);
}
-*/
static void
-trapILL(int signo)
+trapILL(int signo, siginfo_t *si, void *a)
{
USED(signo);
- disfault(nil, "Illegal instruction");
+ USED(a);
+ sysfault("illegal instruction pc=", si->si_addr);
}
-static void
-trapBUS(int signo)
+static int
+isnilref(siginfo_t *si)
{
- USED(signo);
- disfault(nil, "Bus error");
+ return si != 0 && (si->si_addr == (void*)~(uintptr_t)0 || (uintptr_t)si->si_addr < 512);
}
static void
-trapSEGV(int signo)
+trapmemref(int signo, siginfo_t *si, void *a)
{
- USED(signo);
- disfault(nil, "Segmentation violation");
+ USED(a); /* ucontext_t*, could fetch pc in machine-dependent way */
+ if(isnilref(si))
+ disfault(nil, exNilref);
+ else if(signo == SIGBUS)
+ sysfault("bad address addr=", si->si_addr); /* eg, misaligned */
+ else
+ sysfault("segmentation violation addr=", si->si_addr);
}
static void
-trapFPE(int signo)
+trapFPE(int signo, siginfo_t *si, void *a)
{
char buf[64];
+
USED(signo);
- snprint(buf, sizeof(buf), "sys: fp: exception status=%.4lux", getfsr());
+ USED(a);
+ snprint(buf, sizeof(buf), "sys: fp: exception status=%.4lux pc=%#p", getfsr(), si->si_addr);
disfault(nil, buf);
}
@@ -215,37 +96,6 @@ trapUSR1(int signo)
disfault(nil, Eintr); /* Should never happen */
}
-/* called to wake up kproc blocked on a syscall */
-void
-oshostintr(Proc *p)
-{
- kill(p->sigid, SIGUSR1);
-}
-
-static void
-trapUSR2(int signo)
-{
- USED(signo);
- /* we've done our work of interrupting sigsuspend */
-}
-
-void
-osblock(void)
-{
- sigset_t mask;
-
- sigprocmask(SIG_SETMASK, NULL, &mask);
- sigdelset(&mask, SIGUSR2);
- sigsuspend(&mask);
-}
-
-void
-osready(Proc *p)
-{
- if(kill(p->sigid, SIGUSR2) < 0)
- fprint(2, "emu: osready failed: pid %d: %s\n", p->sigid, strerror(errno));
-}
-
void
oslongjmp(void *regs, osjmpbuf env, int val)
{
@@ -301,12 +151,9 @@ osreboot(char *file, char **argv)
void
libinit(char *imod)
{
- struct termios t;
struct sigaction act;
- sigset_t mask;
struct passwd *pw;
Proc *p;
- void *tos;
char sys[64];
setsid();
@@ -323,18 +170,10 @@ libinit(char *imod)
if(dflag == 0)
termset();
- memset(&act, 0 , sizeof(act));
+ memset(&act, 0, sizeof(act));
act.sa_handler = trapUSR1;
sigaction(SIGUSR1, &act, nil);
- sigemptyset(&mask);
- sigaddset(&mask, SIGUSR2);
- sigprocmask(SIG_BLOCK, &mask, NULL);
-
- memset(&act, 0 , sizeof(act));
- act.sa_handler = trapUSR2;
- sigaction(SIGUSR2, &act, nil);
-
act.sa_handler = SIG_IGN;
sigaction(SIGCHLD, &act, nil);
@@ -349,18 +188,23 @@ libinit(char *imod)
signal(SIGINT, cleanexit);
if(sflag == 0) {
- act.sa_handler = trapBUS;
- sigaction(SIGBUS, &act, nil);
- act.sa_handler = trapILL;
+ act.sa_flags = SA_SIGINFO;
+
+ act.sa_sigaction = trapILL;
sigaction(SIGILL, &act, nil);
- act.sa_handler = trapSEGV;
- sigaction(SIGSEGV, &act, nil);
- act.sa_handler = trapFPE;
+
+ act.sa_sigaction = trapFPE;
sigaction(SIGFPE, &act, nil);
+
+ act.sa_sigaction = trapmemref;
+ sigaction(SIGBUS, &act, nil);
+ sigaction(SIGSEGV, &act, nil);
+
+ act.sa_flags = 0;
}
p = newproc();
- p->kstack = stackalloc(p, &tos);
+ kprocinit(p);
pw = getpwuid(getuid());
if(pw != nil)
@@ -371,7 +215,7 @@ libinit(char *imod)
p->env->uid = getuid();
p->env->gid = getgid();
- executeonnewstack(tos, emuinit, imod);
+ emuinit(imod);
}
int
@@ -457,73 +301,3 @@ limbosleep(ulong milsec)
{
return osmillisleep(milsec);
}
-
-void
-osyield(void)
-{
- sched_yield();
-}
-
-void
-ospause(void)
-{
- for(;;)
- pause();
-}
-
-void
-oslopri(void)
-{
- setpriority(PRIO_PROCESS, 0, getpriority(PRIO_PROCESS,0)+4);
-}
-
-static struct {
- Lock l;
- void *free;
-} stacklist;
-
-static void
-_stackfree(void *stack)
-{
- *((void **)stack) = stacklist.free;
- stacklist.free = stack;
-}
-
-static void
-stackfreeandexit(void *stack)
-{
- lock(&stacklist.l);
- _stackfree(stack);
- unlockandexit(&stacklist.l.val);
-}
-
-static void *
-stackalloc(Proc *p, void **tos)
-{
- void *rv;
- lock(&stacklist.l);
- if (stacklist.free == 0) {
- int x;
- /*
- * obtain some more by using sbrk()
- */
- void *more = sbrk(KSTACK * (NSTACKSPERALLOC + 1));
- if (more == 0)
- panic("stackalloc: no more stacks");
- /*
- * align to KSTACK
- */
- more = (void *)((((unsigned long)more) + (KSTACK - 1)) & ~(KSTACK - 1));
- /*
- * free all the new stacks onto the freelist
- */
- for (x = 0; x < NSTACKSPERALLOC; x++)
- _stackfree((char *)more + KSTACK * x);
- }
- rv = stacklist.free;
- stacklist.free = *(void **)rv;
- unlock(&stacklist.l);
- *tos = rv + KSTACK - sizeof(void *);
- *(Proc **)rv = p;
- return rv;
-}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-10 16:50:20 +0000