Skip to content

Commit 90bad6e

Browse files
author
henesy
committed
merge 3a4ecaa73af6efcbfa30eedde025a87dc1d20f27
1 parent 7168ddd commit 90bad6e

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed

OpenBSD/386/include/emu.h

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ struct FPU
1212
{
1313
uchar env[28];
1414
};
15+
#else
16+
extern Proc* getup(void);
17+
#endif
1518

1619
#define KSTACK (32 * 1024)
1720

OpenBSD/386/include/lib9.h

+26
Original file line numberDiff line numberDiff line change
@@ -504,3 +504,29 @@ extern void setfcr(ulong);
504504
extern void setfsr(ulong);
505505
extern ulong getfcr(void);
506506
extern ulong getfsr(void);
507+
/* FCR */
508+
#define FPINEX (1<<5)
509+
#define FPUNFL ((1<<4)|(1<<1))
510+
#define FPOVFL (1<<3)
511+
#define FPZDIV (1<<2)
512+
#define FPINVAL (1<<0)
513+
#define FPRNR (0<<10)
514+
#define FPRZ (3<<10)
515+
#define FPRPINF (2<<10)
516+
#define FPRNINF (1<<10)
517+
#define FPRMASK (3<<10)
518+
#define FPPEXT (3<<8)
519+
#define FPPSGL (0<<8)
520+
#define FPPDBL (2<<8)
521+
#define FPPMASK (3<<8)
522+
/* FSR */
523+
#define FPAINEX FPINEX
524+
#define FPAOVFL FPOVFL
525+
#define FPAUNFL FPUNFL
526+
#define FPAZDIV FPZDIV
527+
#define FPAINVAL FPINVAL
528+
529+
extern void setfcr(ulong);
530+
extern void setfsr(ulong);
531+
extern ulong getfcr(void);
532+
extern ulong getfsr(void);

emu/OpenBSD/mkfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
1515
OBJ=\
1616
asm-$OBJTYPE.$O\
1717
os.$O\
18+
kproc-pthreads.$O\
1819
win-x11a.$O\
1920
$CONF.root.$O\
2021
lock.$O\
@@ -24,7 +25,7 @@ OBJ=\
2425
HFILES=\
2526

2627
CFLAGS='-DROOT="'$ROOT'"' -DEMU -I. -I../port -I$ROOT/$SYSTARG/$OBJTYPE/include -I$ROOT/include -I$ROOT/libinterp $CTHREADFLAGS $CFLAGS $EMUOPTIONS
27-
SYSLIBS= -lm -lX11 -lXext -lossaudio
28+
SYSLIBS= -lm -lX11 -lXext -lossaudio -lpthread
2829
KERNDATE=`{$NDATE}
2930
3031
default:V: $O.$CONF

0 commit comments

Comments
 (0)