diff options
author | Scott Francis <scott@kurokoproject.com> | 2017-07-09 17:01:09 -0700 |
---|---|---|
committer | Scott Francis <scott@kurokoproject.com> | 2017-07-09 17:01:09 -0700 |
commit | 9615754de500d96213e295cb80e41cb24e4a75ac (patch) | |
tree | ccc95e8df88c633508a9fd542b591fd84e263868 | |
parent | 8823998c509302a526d8711095f664dd06997234 (diff) |
Use pthreads instead of rthreads on OpenBSD and add back FPU support
-rw-r--r-- | OpenBSD/386/include/emu.h | 4 | ||||
-rw-r--r-- | OpenBSD/386/include/lib9.h | 31 | ||||
-rw-r--r-- | emu/OpenBSD/asm-386.S | 2 | ||||
-rw-r--r-- | emu/OpenBSD/mkfile | 3 | ||||
-rw-r--r-- | emu/OpenBSD/os.c | 224 | ||||
-rw-r--r-- | emu/OpenBSD/rfork_thread.S | 104 | ||||
-rw-r--r-- | lib9/setfcr-OpenBSD-386.S | 34 |
7 files changed, 78 insertions, 324 deletions
diff --git a/OpenBSD/386/include/emu.h b/OpenBSD/386/include/emu.h index 5e03489b..5392e2a4 100644 --- a/OpenBSD/386/include/emu.h +++ b/OpenBSD/386/include/emu.h @@ -15,6 +15,7 @@ struct FPU #define KSTACK (32 * 1024) +#ifndef USE_PTHREADS static __inline Proc *getup(void) { Proc *p; __asm__( "movl %%esp, %%eax\n\t" @@ -22,6 +23,9 @@ static __inline Proc *getup(void) { ); return *(Proc **)((unsigned long)p & ~(KSTACK - 1)); }; +#else +extern Proc* getup(void); +#endif #define up (getup()) diff --git a/OpenBSD/386/include/lib9.h b/OpenBSD/386/include/lib9.h index 69c310e9..377e19f6 100644 --- a/OpenBSD/386/include/lib9.h +++ b/OpenBSD/386/include/lib9.h @@ -1,10 +1,15 @@ /* define _BSD_SOURCE to use ISO C, POSIX, and 4.3BSD things. */ +#define USE_PTHREADS #ifndef _BSD_SOURCE #define _BSD_SOURCE #endif /* these aren't really needed because OpenBSD does the right thing and makes off_t 64 bits, full stop */ #define _LARGEFILE64_SOURCE 1 #define _FILE_OFFSET_BITS 64 + +#ifdef USE_PTHREADS +#define _REENTRANT 1 +#endif #include <sys/types.h> #include <sys/stat.h> #include <stdlib.h> @@ -473,3 +478,29 @@ extern char *argv0; #define setbinmode() +/* FCR */ +#define FPINEX (1<<5) +#define FPUNFL ((1<<4)|(1<<1)) +#define FPOVFL (1<<3) +#define FPZDIV (1<<2) +#define FPINVAL (1<<0) +#define FPRNR (0<<10) +#define FPRZ (3<<10) +#define FPRPINF (2<<10) +#define FPRNINF (1<<10) +#define FPRMASK (3<<10) +#define FPPEXT (3<<8) +#define FPPSGL (0<<8) +#define FPPDBL (2<<8) +#define FPPMASK (3<<8) +/* FSR */ +#define FPAINEX FPINEX +#define FPAOVFL FPOVFL +#define FPAUNFL FPUNFL +#define FPAZDIV FPZDIV +#define FPAINVAL FPINVAL + +extern void setfcr(ulong); +extern void setfsr(ulong); +extern ulong getfcr(void); +extern ulong getfsr(void); diff --git a/emu/OpenBSD/asm-386.S b/emu/OpenBSD/asm-386.S index f3a3f9cf..e7c9fa3e 100644 --- a/emu/OpenBSD/asm-386.S +++ b/emu/OpenBSD/asm-386.S @@ -3,8 +3,6 @@ #include <sys/syscall.h> #include <machine/asm.h> -#include "rfork_thread.S" - /* * executeonnewstack(void *tos, void (*tramp)(void *arg), void *arg) */ diff --git a/emu/OpenBSD/mkfile b/emu/OpenBSD/mkfile index ad4e3155..a030c95e 100644 --- a/emu/OpenBSD/mkfile +++ b/emu/OpenBSD/mkfile @@ -19,6 +19,7 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal OBJ=\ asm-$OBJTYPE.$O\ os.$O\ + kproc-pthreads.$O\ win-x11a.$O\ $CONF.root.$O\ lock.$O\ @@ -28,7 +29,7 @@ OBJ=\ HFILES=\ CFLAGS='-DROOT="'$ROOT'"' -DEMU -I. -I../port -I$ROOT/$SYSTARG/$OBJTYPE/include -I$ROOT/include -I$ROOT/libinterp $CTHREADFLAGS $CFLAGS $EMUOPTIONS -SYSLIBS= -lm -lX11 -lXext -lossaudio +SYSLIBS= -lm -lX11 -lXext -lossaudio -lpthread KERNDATE=`{$NDATE} default:V: $O.$CONF diff --git a/emu/OpenBSD/os.c b/emu/OpenBSD/os.c index f45e69d6..fc16cc30 100644 --- a/emu/OpenBSD/os.c +++ b/emu/OpenBSD/os.c @@ -24,60 +24,16 @@ enum }; char *hosttype = "OpenBSD"; -int rfork_thread(int, void *, void (*)(void *), void *); - -extern void unlockandexit(int*); -extern void executeonnewstack(void*, void (*f)(void*), void*); -static void *stackalloc(Proc *p, void **tos); -static void stackfreeandexit(void *stack); - extern int dflag; void -pexit(char *msg, int t) -{ - Osenv *e; - Proc *p; - void *kstack; - - lock(&procs.l); - p = up; - if(p->prev) - p->prev->next = p->next; - else - procs.head = p->next; - - if(up->next) - p->next->prev = p->prev; - else - procs.tail = p->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 = p->kstack; - free(p->prog); - free(p); - if(kstack != nil) - stackfreeandexit(kstack); -} - -void trapBUS(int signo, siginfo_t *info, void *context) { if(info) print("trapBUS: signo: %d code: %d addr: %lx\n", info->si_signo, info->si_code, info->si_addr); else - print("trapBUS: no info\n"); + print("trapBUS: no info\n"); disfault(nil, "Bus error"); } @@ -135,7 +91,7 @@ setsigs(void) memset(&act, 0 , sizeof(act)); sigemptyset(&initmask); - + signal(SIGPIPE, SIG_IGN); /* prevent signal when devcmd child exits */ if(signal(SIGTERM, SIG_IGN) != SIG_IGN) signal(SIGTERM, cleanexit); @@ -180,101 +136,6 @@ setsigs(void) panic("sigprocmask"); } -static void -tramp(void *arg) -{ - Proc *p; - - p = arg; - p->pid = p->sigid = getpid(); - sigprocmask(SIG_BLOCK, &initmask, nil); /* in 5.3, rfork_thread doesn't copy from parent, contrary to docs? */ - (*p->func)(p->arg); - pexit("{Tramp}", 0); - _exit(0); -} - -void -kproc(char *name, void (*func)(void*), void *arg, int flags) -{ - Proc *p; - Pgrp *pg; - Fgrp *fg; - Egrp *eg; - int pid; - void *tos; - - p = newproc(); - - 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; - - 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(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); - pid = rfork_thread(RFPROC|RFMEM|RFNOWAIT, tos, tramp, p); - if(pid < 0) - panic("rfork"); -} - -void -oshostintr(Proc *p) -{ - kill(p->sigid, SIGUSR1); -} - -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) { @@ -335,7 +196,7 @@ void getnobody() { struct passwd *pwd; - + if(pwd = getpwnam("nobody")) { uidnobody = pwd->pw_uid; gidnobody = pwd->pw_gid; @@ -347,7 +208,6 @@ libinit(char *imod) { struct passwd *pw; Proc *p; - void *tos; char sys[64]; setsid(); @@ -362,18 +222,18 @@ libinit(char *imod) setsigs(); p = newproc(); - p->kstack = stackalloc(p, &tos); + kprocinit(p); pw = getpwuid(getuid()); if(pw != nil) kstrdup(&eve, pw->pw_name); else print("cannot getpwuid\n"); - + p->env->uid = getuid(); p->env->gid = getgid(); - executeonnewstack(tos, emuinit, imod); + emuinit(imod); } int @@ -440,7 +300,7 @@ vlong osusectime(void) { struct timeval t; - + gettimeofday(&t, nil); return (vlong)t.tv_sec * 1000000 + t.tv_usec; } @@ -456,76 +316,6 @@ osmillisleep(ulong milsec) return 0; } -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; -} - int segflush(void *p, ulong n) { diff --git a/emu/OpenBSD/rfork_thread.S b/emu/OpenBSD/rfork_thread.S deleted file mode 100644 index bb7cd010..00000000 --- a/emu/OpenBSD/rfork_thread.S +++ /dev/null @@ -1,104 +0,0 @@ -/*- - * Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * 8 12 16 20 - * rfork_thread(flags, stack_addr, start_fnc, start_arg); - * - * flags: Flags to rfork system call. See rfork(2). - * stack_addr: Top of stack for thread. - * start_fnc: Address of thread function to call in child. - * start_arg: Argument to pass to the thread function in child. - */ - -ENTRY(rfork_thread) - pushl %ebp - movl %esp, %ebp - pushl %esi - - /* - * Push thread info onto the new thread's stack - */ - movl 12(%ebp), %esi # get stack addr - - subl $4, %esi - movl 20(%ebp), %eax # get start argument - movl %eax, (%esi) - - subl $4, %esi - movl 16(%ebp), %eax # get start thread address - movl %eax, (%esi) - - /* - * Prepare and execute the thread creation syscall - */ - pushl 8(%ebp) - pushl $0 - movl $SYS_rfork, %eax - int $0x80 - jb 2f - - /* - * Check to see if we are in the parent or child - */ - cmpl $0, %edx - jnz 1f - addl $8, %esp - popl %esi - movl %ebp, %esp - popl %ebp - ret - .p2align 2 - - /* - * If we are in the child (new thread), then - * set-up the call to the internal subroutine. If it - * returns, then call __exit. - */ -1: - movl %esi,%esp - popl %eax - call *%eax - addl $4, %esp - - /* - * Exit system call - */ - pushl %eax - pushl $0 - movl $SYS_threxit, %eax - int $0x80 - - /* - * Branch here if the thread creation fails: - */ -2: - addl $8, %esp - popl %esi - movl %ebp, %esp - popl %ebp - PIC_PROLOGUE - jmp PIC_PLT(_C_LABEL(__cerror)) diff --git a/lib9/setfcr-OpenBSD-386.S b/lib9/setfcr-OpenBSD-386.S new file mode 100644 index 00000000..d981f36a --- /dev/null +++ b/lib9/setfcr-OpenBSD-386.S @@ -0,0 +1,34 @@ + +#define FN(x) .type x,@function; .global x; x +#define ENT subl $16, %esp +#define RET addl $16, %esp; ret + + .file "setfcr-Linux-386.S" +FN(setfcr): + ENT + xorb $0x3f, %al + movl %eax, (%esp) + fwait + fldcw (%esp) + RET + +FN(getfcr): + ENT + fwait + fstcw (%esp) + movw (%esp), %ax + andl $0xffff, %eax + xorb $0x3f, %al + RET + +FN(getfsr): + ENT + fwait + fstsw (%esp) + movw (%esp), %ax + andl $0xffff, %eax + RET + +FN(setfsr): + fclex + ret |