diff options
author | Charles Forsyth <charles.forsyth@gmail.com> | 2018-12-21 15:12:00 +0000 |
---|---|---|
committer | Charles Forsyth <charles.forsyth@gmail.com> | 2018-12-21 15:12:00 +0000 |
commit | f092bcd9be21a77f026a7c3227a920437d35b9e5 (patch) | |
tree | fd953df2a342e9cf9313f23b98d46e927f3da258 | |
parent | 0195c4e25fc394097552c7f5ebf3085ec2d201f5 (diff) | |
parent | af364d9265f84faf807f5db6b8db6936a92124c6 (diff) |
Merged in nbuwe/inferno-os/NetBSD/powerpc (pull request #10)
NetBSD/powerpc
Approved-by: Charles Forsyth <charles.forsyth@gmail.com>
-rw-r--r-- | NetBSD/386/include/lib9.h | 1 | ||||
-rw-r--r-- | NetBSD/power/include/emu.h | 28 | ||||
-rw-r--r-- | NetBSD/power/include/lib9.h | 527 | ||||
-rw-r--r-- | emu/NetBSD/asm-power.S | 91 | ||||
-rw-r--r-- | emu/NetBSD/emu | 3 | ||||
-rw-r--r-- | emu/NetBSD/emu-g | 4 | ||||
-rw-r--r-- | emu/NetBSD/emu.c | 88 | ||||
-rw-r--r-- | emu/NetBSD/mkfile | 7 | ||||
-rw-r--r-- | emu/NetBSD/os.c | 8 | ||||
-rw-r--r-- | emu/NetBSD/segflush-386.c | 9 | ||||
-rw-r--r-- | emu/NetBSD/segflush-power.c | 12 | ||||
-rw-r--r-- | lib9/getcallerpc-NetBSD-386.S | 7 | ||||
-rw-r--r-- | lib9/getcallerpc-NetBSD-power.S | 6 | ||||
-rw-r--r-- | lib9/setfcr-NetBSD-386.S | 15 | ||||
-rw-r--r-- | lib9/setfcr-NetBSD-power.S | 33 | ||||
-rw-r--r-- | libinterp/comp-power.c | 45 | ||||
-rw-r--r-- | mkfiles/mkfile-NetBSD-386 | 1 | ||||
-rw-r--r-- | mkfiles/mkfile-NetBSD-power | 30 |
18 files changed, 804 insertions, 111 deletions
diff --git a/NetBSD/386/include/lib9.h b/NetBSD/386/include/lib9.h index c8eb499a..4e1658ac 100644 --- a/NetBSD/386/include/lib9.h +++ b/NetBSD/386/include/lib9.h @@ -244,6 +244,7 @@ extern ulong ntruerand(ulong); * math */ extern int isNaN(double); +extern double NaN(void); extern int isInf(double, int); extern double pow(double, double); diff --git a/NetBSD/power/include/emu.h b/NetBSD/power/include/emu.h new file mode 100644 index 00000000..83af30d8 --- /dev/null +++ b/NetBSD/power/include/emu.h @@ -0,0 +1,28 @@ +/* + * system- and machine-specific declarations for emu: + * floating-point save and restore, signal handling primitive, and + * implementation of the current-process variable `up'. + */ + +/* + * This structure must agree with FPsave and FPrestore asm routines + */ +typedef struct FPU FPU; +struct FPU +{ + uchar env[18*8]; +}; + +#define KSTACK (32 * 1024) + +static __inline Proc *getup(void) { + Proc *p; + __asm__( "mr %0, 1" : "=r" (p)); + return *(Proc **)((unsigned long)p & ~(KSTACK - 1)); +}; + +#define up (getup()) + +typedef sigjmp_buf osjmpbuf; +#define ossetjmp(buf) sigsetjmp(buf, 1) + diff --git a/NetBSD/power/include/lib9.h b/NetBSD/power/include/lib9.h new file mode 100644 index 00000000..d5ea7a1d --- /dev/null +++ b/NetBSD/power/include/lib9.h @@ -0,0 +1,527 @@ +#include <sys/types.h> +#include <sys/endian.h> +#include <sys/stat.h> +#include <stdint.h> +#include <stdlib.h> +#include <stdarg.h> +#include <unistd.h> +#include <errno.h> +#include <string.h> +#include <math.h> +#include <fcntl.h> +#include <setjmp.h> +#include <float.h> +#include <time.h> + +#define getwd infgetwd + +#define round infround +#define fmax inffmax +#define log2 inflog2 + +#ifndef EMU +typedef struct Proc Proc; +#endif + +/* + * math module dtoa + */ +#if _BYTE_ORDER == _LITTLE_ENDIAN +#define __LITTLE_ENDIAN +#endif + +#define nil ((void*)0) + +typedef unsigned char uchar; +typedef signed char schar; +#if 0 /* XXX: uwe: already defined in <sys/types.h> */ +typedef unsigned long ulong; +#endif + +typedef int64_t vlong; +typedef uint64_t uvlong; + +typedef uint8_t u8int; +typedef uint16_t u16int; +typedef uint32_t u32int; +typedef uvlong u64int; + +typedef uintptr_t uintptr; + +typedef signed char int8; +typedef unsigned char uint8; +typedef short int16; +typedef unsigned short uint16; +typedef int int32; +typedef unsigned int uint32; +typedef long long int64; +typedef unsigned long long uint64; + +typedef unsigned int Rune; +typedef unsigned int mpdigit; /* for /sys/include/mp.h */ + + +#define USED(x) if(x){}else{} +#define SET(x) + +#undef nelem +#define nelem(x) (sizeof(x)/sizeof((x)[0])) +#undef offsetof +#define offsetof(s, m) (ulong)(&(((s*)0)->m)) +#undef assert +#define assert(x) if(x){}else _assert(#x) + +/* + * most mem and string routines are declared by ANSI/POSIX files above + */ + +extern char* strecpy(char*, char*, char*); +extern char* strdup(const char*); +extern int cistrncmp(char*, char*, int); +extern int cistrcmp(char*, char*); +extern char* cistrstr(char*, char*); +extern int tokenize(char*, char**, int); + +enum +{ + UTFmax = 4, /* maximum bytes per rune */ + Runesync = 0x80, /* cannot represent part of a UTF sequence (<) */ + Runeself = 0x80, /* rune and UTF sequences are the same (<) */ + Runeerror = 0xFFFD, /* decoding error in UTF */ + Runemax = 0x10FFFF, /* 21-bit rune */ + Runemask = 0x1FFFFF, /* bits used by runes (see grep) */ +}; + +/* + * rune routines + */ +extern int runetochar(char*, Rune*); +extern int chartorune(Rune*, char*); +extern int runelen(long); +extern int runenlen(Rune*, int); +extern int fullrune(char*, int); +extern int utflen(char*); +extern int utfnlen(char*, long); +extern char* utfrune(char*, long); +extern char* utfrrune(char*, long); +extern char* utfutf(char*, char*); +extern char* utfecpy(char*, char*, char*); + +extern Rune* runestrcat(Rune*, Rune*); +extern Rune* runestrchr(Rune*, Rune); +extern int runestrcmp(Rune*, Rune*); +extern Rune* runestrcpy(Rune*, Rune*); +extern Rune* runestrncpy(Rune*, Rune*, long); +extern Rune* runestrecpy(Rune*, Rune*, Rune*); +extern Rune* runestrdup(Rune*); +extern Rune* runestrncat(Rune*, Rune*, long); +extern int runestrncmp(Rune*, Rune*, long); +extern Rune* runestrrchr(Rune*, Rune); +extern long runestrlen(Rune*); +extern Rune* runestrstr(Rune*, Rune*); + +extern Rune tolowerrune(Rune); +extern Rune totitlerune(Rune); +extern Rune toupperrune(Rune); +extern int isalpharune(Rune); +extern int islowerrune(Rune); +extern int isspacerune(Rune); +extern int istitlerune(Rune); +extern int isupperrune(Rune); + +/* + * malloc + */ +extern void* malloc(size_t); +extern void* mallocz(ulong, int); +extern void free(void*); +extern ulong msize(void*); +extern void* calloc(size_t, size_t); +extern void* realloc(void*, size_t); +extern void setmalloctag(void*, ulong); +extern void setrealloctag(void*, ulong); +extern ulong getmalloctag(void*); +extern ulong getrealloctag(void*); +extern void* malloctopoolblock(void*); + +/* + * print routines + */ +typedef struct Fmt Fmt; +struct Fmt{ + uchar runes; /* output buffer is runes or chars? */ + void *start; /* of buffer */ + void *to; /* current place in the buffer */ + void *stop; /* end of the buffer; overwritten if flush fails */ + int (*flush)(Fmt *); /* called when to == stop */ + void *farg; /* to make flush a closure */ + int nfmt; /* num chars formatted so far */ + va_list args; /* args passed to dofmt */ + int r; /* % format Rune */ + int width; + int prec; + ulong flags; +}; + +enum{ + FmtWidth = 1, + FmtLeft = FmtWidth << 1, + FmtPrec = FmtLeft << 1, + FmtSharp = FmtPrec << 1, + FmtSpace = FmtSharp << 1, + FmtSign = FmtSpace << 1, + FmtZero = FmtSign << 1, + FmtUnsigned = FmtZero << 1, + FmtShort = FmtUnsigned << 1, + FmtLong = FmtShort << 1, + FmtVLong = FmtLong << 1, + FmtComma = FmtVLong << 1, + FmtByte = FmtComma << 1, + + FmtFlag = FmtByte << 1 +}; + +extern int print(char*, ...); +extern char* seprint(char*, char*, char*, ...); +extern char* vseprint(char*, char*, char*, va_list); +extern int snprint(char*, int, char*, ...); +extern int vsnprint(char*, int, char*, va_list); +extern char* smprint(char*, ...); +extern char* vsmprint(char*, va_list); +extern int sprint(char*, char*, ...); +extern int fprint(int, char*, ...); +extern int vfprint(int, char*, va_list); + +extern int runesprint(Rune*, char*, ...); +extern int runesnprint(Rune*, int, char*, ...); +extern int runevsnprint(Rune*, int, char*, va_list); +extern Rune* runeseprint(Rune*, Rune*, char*, ...); +extern Rune* runevseprint(Rune*, Rune*, char*, va_list); +extern Rune* runesmprint(char*, ...); +extern Rune* runevsmprint(char*, va_list); + +extern int fmtfdinit(Fmt*, int, char*, int); +extern int fmtfdflush(Fmt*); +extern int fmtstrinit(Fmt*); +extern char* fmtstrflush(Fmt*); +extern int runefmtstrinit(Fmt*); +extern Rune* runefmtstrflush(Fmt*); + +extern int fmtinstall(int, int (*)(Fmt*)); +extern int dofmt(Fmt*, char*); +extern int dorfmt(Fmt*, Rune*); +extern int fmtprint(Fmt*, char*, ...); +extern int fmtvprint(Fmt*, char*, va_list); +extern int fmtrune(Fmt*, int); +extern int fmtstrcpy(Fmt*, char*); +extern int fmtrunestrcpy(Fmt*, Rune*); +/* + * error string for %r + * supplied on per os basis, not part of fmt library + */ +extern int errfmt(Fmt *f); + +/* + * quoted strings + */ +extern char *unquotestrdup(char*); +extern Rune *unquoterunestrdup(Rune*); +extern char *quotestrdup(char*); +extern Rune *quoterunestrdup(Rune*); +extern int quotestrfmt(Fmt*); +extern int quoterunestrfmt(Fmt*); +extern void quotefmtinstall(void); +extern int (*doquote)(int); + +/* + * random number + */ +extern int nrand(int); +extern ulong truerand(void); +extern ulong ntruerand(ulong); + +/* + * math + */ +extern int isNaN(double); +extern double NaN(void); +extern int isInf(double, int); +extern double pow(double, double); + +/* + * Time-of-day + */ + +typedef struct Tm Tm; +struct Tm { + int sec; + int min; + int hour; + int mday; + int mon; + int year; + int wday; + int yday; + char zone[4]; + int tzoff; +}; +extern vlong osnsec(void); +#define nsec osnsec + +/* + * one-of-a-kind + */ +extern void _assert(char*); +extern double charstod(int(*)(void*), void*); +extern char* cleanname(char*); +extern double frexp(double, int*); +extern ulong getcallerpc(void*); +extern int getfields(char*, char**, int, int, char*); +extern char* getuser(void); +extern char* getwd(char*, int); +extern double ipow10(int); +extern double ldexp(double, int); +extern double modf(double, double*); +#define pow10 infpow10 +extern double pow10(int); +extern vlong strtoll(const char*, char**, int); +#define qsort infqsort +extern void qsort(void*, long, long, int (*)(void*, void*)); +extern uvlong strtoull(const char*, char**, int); +extern void sysfatal(char*, ...); +extern int dec64(uchar*, int, char*, int); +extern int enc64(char*, int, uchar*, int); +extern int dec32(uchar*, int, char*, int); +extern int enc32(char*, int, uchar*, int); +extern int dec16(uchar*, int, char*, int); +extern int enc16(char*, int, uchar*, int); +extern int encodefmt(Fmt*); + +/* + * synchronization + */ +typedef +struct Lock { + int val; + int pid; +} Lock; + +extern int _tas(int*); + +extern void lock(Lock*); +extern void unlock(Lock*); +extern int canlock(Lock*); + +typedef struct QLock QLock; +struct QLock +{ + Lock use; /* to access Qlock structure */ + Proc *head; /* next process waiting for object */ + Proc *tail; /* last process waiting for object */ + int locked; /* flag */ +}; + +extern void qlock(QLock*); +extern void qunlock(QLock*); +extern int canqlock(QLock*); +extern void _qlockinit(ulong (*)(ulong, ulong)); /* called only by the thread library */ + +typedef +struct RWLock +{ + Lock l; /* Lock modify lock */ + QLock x; /* Mutual exclusion lock */ + QLock k; /* Lock for waiting writers */ + int readers; /* Count of readers in lock */ +} RWLock; + +extern int canrlock(RWLock*); +extern int canwlock(RWLock*); +extern void rlock(RWLock*); +extern void runlock(RWLock*); +extern void wlock(RWLock*); +extern void wunlock(RWLock*); + +/* + * network dialing + */ +#define NETPATHLEN 40 + +/* + * system calls + * + */ +#define STATMAX 65535U /* max length of machine-independent stat structure */ +#define DIRMAX (sizeof(Dir)+STATMAX) /* max length of Dir structure */ +#define ERRMAX 128 /* max length of error string */ + +#define MORDER 0x0003 /* mask for bits defining order of mounting */ +#define MREPL 0x0000 /* mount replaces object */ +#define MBEFORE 0x0001 /* mount goes before others in union directory */ +#define MAFTER 0x0002 /* mount goes after others in union directory */ +#define MCREATE 0x0004 /* permit creation in mounted directory */ +#define MCACHE 0x0010 /* cache some data */ +#define MMASK 0x0017 /* all bits on */ + +#define OREAD 0 /* open for read */ +#define OWRITE 1 /* write */ +#define ORDWR 2 /* read and write */ +#define OEXEC 3 /* execute, == read but check execute permission */ +#define OTRUNC 16 /* or'ed in (except for exec), truncate file first */ +#define OCEXEC 32 /* or'ed in, close on exec */ +#define ORCLOSE 64 /* or'ed in, remove on close */ +#define OEXCL 0x1000 /* or'ed in, exclusive use (create only) */ + +#define AEXIST 0 /* accessible: exists */ +#define AEXEC 1 /* execute access */ +#define AWRITE 2 /* write access */ +#define AREAD 4 /* read access */ + +/* bits in Qid.type */ +#define QTDIR 0x80 /* type bit for directories */ +#define QTAPPEND 0x40 /* type bit for append only files */ +#define QTEXCL 0x20 /* type bit for exclusive use files */ +#define QTMOUNT 0x10 /* type bit for mounted channel */ +#define QTAUTH 0x08 /* type bit for authentication file */ +#define QTFILE 0x00 /* plain file */ + +/* bits in Dir.mode */ +#define DMDIR 0x80000000 /* mode bit for directories */ +#define DMAPPEND 0x40000000 /* mode bit for append only files */ +#define DMEXCL 0x20000000 /* mode bit for exclusive use files */ +#define DMMOUNT 0x10000000 /* mode bit for mounted channel */ +#define DMAUTH 0x08000000 /* mode bit for authentication file */ +#define DMREAD 0x4 /* mode bit for read permission */ +#define DMWRITE 0x2 /* mode bit for write permission */ +#define DMEXEC 0x1 /* mode bit for execute permission */ + +typedef +struct Qid +{ + uvlong path; + ulong vers; + uchar type; +} Qid; + +typedef +struct Dir { + /* system-modified data */ + ushort type; /* server type */ + uint dev; /* server subtype */ + /* file data */ + Qid qid; /* unique id from server */ + ulong mode; /* permissions */ + ulong atime; /* last read time */ + ulong mtime; /* last write time */ + vlong length; /* file length */ + char *name; /* last element of path */ + char *uid; /* owner name */ + char *gid; /* group name */ + char *muid; /* last modifier name */ +} Dir; + +extern Dir* dirstat(char*); +extern Dir* dirfstat(int); +extern int dirwstat(char*, Dir*); +extern int dirfwstat(int, Dir*); +extern long dirread(int, Dir**); +extern void nulldir(Dir*); +extern long dirreadall(int, Dir**); + +typedef +struct Waitmsg +{ + int pid; /* of loved one */ + ulong time[3]; /* of loved one & descendants */ + char *msg; +} Waitmsg; + +extern void _exits(char*); + +extern void exits(char*); +extern int create(char*, int, int); +extern int errstr(char*, uint); + +extern void perror(const char*); +extern long readn(int, void*, long); +extern int remove(const char*); +extern void rerrstr(char*, uint); +extern vlong seek(int, vlong, int); +extern int segflush(void*, ulong); +extern void werrstr(char*, ...); + +extern char *argv0; +#define ARGBEGIN for((argv0||(argv0=*argv)),argv++,argc--;\ + argv[0] && argv[0][0]=='-' && argv[0][1];\ + argc--, argv++) {\ + char *_args, *_argt;\ + Rune _argc;\ + _args = &argv[0][1];\ + if(_args[0]=='-' && _args[1]==0){\ + argc--; argv++; break;\ + }\ + _argc = 0;\ + while(*_args && (_args += chartorune(&_argc, _args)))\ + switch(_argc) +#define ARGEND SET(_argt);USED(_argt);USED(_argc); USED(_args);}USED(argv); USED(argc); +#define ARGF() (_argt=_args, _args="",\ + (*_argt? _argt: argv[1]? (argc--, *++argv): 0)) +#define EARGF(x) (_argt=_args, _args="",\ + (*_argt? _argt: argv[1]? (argc--, *++argv): ((x), abort(), (char*)0))) + +#define ARGC() _argc + +/* + * Extensions for Inferno to basic libc.h + */ + +#define setbinmode() + +extern void setfcr(ulong); +extern void setfsr(ulong); +extern ulong getfcr(void); +extern ulong getfsr(void); + + +/* FPSCR */ +#define FPSFX (1<<31) /* exception summary (sticky) */ +#define FPSEX (1<<30) /* enabled exception summary */ +#define FPSVX (1<<29) /* invalid operation exception summary */ +#define FPSOX (1<<28) /* overflow exception OX (sticky) */ +#define FPSUX (1<<27) /* underflow exception UX (sticky) */ +#define FPSZX (1<<26) /* zero divide exception ZX (sticky) */ +#define FPSXX (1<<25) /* inexact exception XX (sticky) */ +#define FPSVXSNAN (1<<24) /* invalid operation exception for SNaN (sticky) */ +#define FPSVXISI (1<<23) /* invalid operation exception for ∞-∞ (sticky) */ +#define FPSVXIDI (1<<22) /* invalid operation exception for ∞/∞ (sticky) */ +#define FPSVXZDZ (1<<21) /* invalid operation exception for 0/0 (sticky) */ +#define FPSVXIMZ (1<<20) /* invalid operation exception for ∞*0 (sticky) */ +#define FPSVXVC (1<<19) /* invalid operation exception for invalid compare (sticky) */ +#define FPSFR (1<<18) /* fraction rounded */ +#define FPSFI (1<<17) /* fraction inexact */ +#define FPSFPRF (1<<16) /* floating point result class */ +#define FPSFPCC (0xF<<12) /* <, >, =, unordered */ +#define FPVXCVI (1<<8) /* enable exception for invalid integer convert (sticky) */ + +/* FCR */ +#define FPVE (1<<7) /* invalid operation exception enable */ +#define FPOVFL (1<<6) /* enable overflow exceptions */ +#define FPUNFL (1<<5) /* enable underflow */ +#define FPZDIV (1<<4) /* enable zero divide */ +#define FPINEX (1<<3) /* enable inexact exceptions */ +#define FPRMASK (3<<0) /* rounding mode */ +#define FPRNR (0<<0) +#define FPRZ (1<<0) +#define FPRPINF (2<<0) +#define FPRNINF (3<<0) +#define FPPEXT 0 +#define FPPSGL 0 +#define FPPDBL 0 +#define FPPMASK 0 +#define FPINVAL FPVE +/* FSR */ +#define FPAOVFL FPSOX +#define FPAINEX FPSXX +#define FPAUNFL FPSUX +#define FPAZDIV FPSZX +#define FPAINVAL FPSVX diff --git a/emu/NetBSD/asm-power.S b/emu/NetBSD/asm-power.S new file mode 100644 index 00000000..da40e825 --- /dev/null +++ b/emu/NetBSD/asm-power.S @@ -0,0 +1,91 @@ +#include <machine/asm.h> + +ENTRY_NOPROFILE(FPsave) + stfd %f14,0*8(%r3) + stfd %f15,1*8(%r3) + stfd %f16,2*8(%r3) + stfd %f17,3*8(%r3) + stfd %f18,4*8(%r3) + stfd %f19,5*8(%r3) + stfd %f20,6*8(%r3) + stfd %f21,7*8(%r3) + stfd %f22,8*8(%r3) + stfd %f23,9*8(%r3) + stfd %f24,10*8(%r3) + stfd %f25,11*8(%r3) + stfd %f26,12*8(%r3) + stfd %f27,13*8(%r3) + stfd %f28,14*8(%r3) + stfd %f29,15*8(%r3) + stfd %f30,16*8(%r3) + stfd %f31,17*8(%r3) + blr + END(FPsave) + +ENTRY_NOPROFILE(FPrestore) + lfd %f14,0*8(%r3) + lfd %f15,1*8(%r3) + lfd %f16,2*8(%r3) + lfd %f17,3*8(%r3) + lfd %f18,4*8(%r3) + lfd %f19,5*8(%r3) + lfd %f20,6*8(%r3) + lfd %f21,7*8(%r3) + lfd %f22,8*8(%r3) + lfd %f23,9*8(%r3) + lfd %f24,10*8(%r3) + lfd %f25,11*8(%r3) + lfd %f26,12*8(%r3) + lfd %f27,13*8(%r3) + lfd %f28,14*8(%r3) + lfd %f29,15*8(%r3) + lfd %f30,16*8(%r3) + lfd %f31,17*8(%r3) + blr + END(FPrestore) + +ENTRY_NOPROFILE(_tas) + sync + mr %r4, %r3 + addi %r5,0,0x1 +1: + lwarx %r3, 0, %r4 + cmpwi %r3, 0 + bne- 2f + stwcx. %r5, 0, %r4 + bne- 1b +2: + sync + blr + END(_tas) + +/* + * void + * executeonnewstack(void *tos, void (*tramp)(void *arg), void *arg) + */ +ENTRY_NOPROFILE(executeonnewstack) + mr %r1,%r3 /* change stacks */ + stwu %lr,-16(%r1) /* save lr to aid the traceback */ + li %r0,0 + stw %r0,20(%r1) + mr %r3,%r5 + mtctr %r4 + bctrl /* tramp(arg) */ + br + END(executeonnewstack) + +/* + * void unlockandexit(int *key) + * + * NB: the return status may be garbaged if the stack is reused + * between the unlock and the system call, but this should + * not matter since no task is waiting for the result + */ +ENTRY_NOPROFILE(unlockandexit) + li %r0,0x0 + stw %r0,0(%r3) /* unlock */ + li %r0,1 /* sys exit; 234 is exit group */ + li %r3,0 /* exit status */ + sc + br + END(unlockandexit) diff --git a/emu/NetBSD/emu b/emu/NetBSD/emu index 55705a2b..d89c5bc5 100644 --- a/emu/NetBSD/emu +++ b/emu/NetBSD/emu @@ -81,6 +81,9 @@ port uqid code + #ifdef __powerpc__ + int macjit = 1; /* tell compiler it's not plan9 abi */ + #endif init emuinit diff --git a/emu/NetBSD/emu-g b/emu/NetBSD/emu-g index e662b4c1..6e87297a 100644 --- a/emu/NetBSD/emu-g +++ b/emu/NetBSD/emu-g @@ -70,6 +70,10 @@ port uqid code + #ifdef __powerpc__ + int macjit = 1; /* tell compiler it's not plan9 abi */ + #endif + void setpointer(int x, int y){USED(x); USED(y);} ulong strtochan(char *s){USED(s); return ~0;} diff --git a/emu/NetBSD/emu.c b/emu/NetBSD/emu.c deleted file mode 100644 index 69e1139d..00000000 --- a/emu/NetBSD/emu.c +++ /dev/null @@ -1,88 +0,0 @@ -#include "dat.h" -#include "fns.h" -#include "error.h" -#include "interp.h" - - -#include "emu.root.h" - -ulong ndevs = 29; - -extern Dev rootdevtab; -extern Dev consdevtab; -extern Dev envdevtab; -extern Dev mntdevtab; -extern Dev pipedevtab; -extern Dev progdevtab; -extern Dev profdevtab; -extern Dev srvdevtab; -extern Dev dupdevtab; -extern Dev ssldevtab; -extern Dev capdevtab; -extern Dev fsdevtab; -extern Dev cmddevtab; -extern Dev indirdevtab; -extern Dev drawdevtab; -extern Dev pointerdevtab; -extern Dev snarfdevtab; -extern Dev ipdevtab; -extern Dev eiadevtab; -extern Dev audiodevtab; -extern Dev memdevtab; -Dev* devtab[]={ - &rootdevtab, - &consdevtab, - &envdevtab, - &mntdevtab, - &pipedevtab, - &progdevtab, - &profdevtab, - &srvdevtab, - &dupdevtab, - &ssldevtab, - &capdevtab, - &fsdevtab, - &cmddevtab, - &indirdevtab, - &drawdevtab, - &pointerdevtab, - &snarfdevtab, - &ipdevtab, - &eiadevtab, - &audiodevtab, - &memdevtab, - nil, - nil, - nil, - nil, - nil, - nil, - nil, - nil, - nil, -}; - -void links(void){ -} - -extern void sysmodinit(void); -extern void drawmodinit(void); -extern void tkmodinit(void); -extern void mathmodinit(void); -extern void srvmodinit(void); -extern void keyringmodinit(void); -extern void loadermodinit(void); -extern void freetypemodinit(void); -void modinit(void){ - sysmodinit(); - drawmodinit(); - tkmodinit(); - mathmodinit(); - srvmodinit(); - keyringmodinit(); - loadermodinit(); - freetypemodinit(); -} - -char* conffile = "emu"; -ulong kerndate = KERNDATE; diff --git a/emu/NetBSD/mkfile b/emu/NetBSD/mkfile index effbaefe..ce001d96 100644 --- a/emu/NetBSD/mkfile +++ b/emu/NetBSD/mkfile @@ -1,8 +1,6 @@ SYSTARG=NetBSD -OBJTYPE=386 <../../mkconfig SYSTARG=NetBSD -OBJTYPE=386 #Configurable parameters @@ -24,6 +22,7 @@ X11LIBS= -L/usr/X11R7/lib -R/usr/X11R7/lib -lXext -lX11 OBJ=\ asm-$OBJTYPE.$O\ os.$O\ + segflush-$OBJTYPE.$O\ $CONF.root.$O\ lock.$O\ $DEVS\ @@ -37,8 +36,6 @@ KERNDATE=`{$NDATE} default:V: $O.$CONF -<../port/portmkfile - $O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS @@ -46,4 +43,6 @@ $O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES install:V: $O.$CONF cp $O.$CONF $INSTALLDIR/$CONF +<../port/portmkfile + devfs.$O: ../port/devfs-posix.c diff --git a/emu/NetBSD/os.c b/emu/NetBSD/os.c index e299a188..b6ffab99 100644 --- a/emu/NetBSD/os.c +++ b/emu/NetBSD/os.c @@ -527,11 +527,3 @@ stackalloc(Proc *p, void **tos) *(Proc **)rv = p; return rv; } - -int -segflush(void *a, ulong n) -{ - USED(a); - USED(n); - return 0; -} diff --git a/emu/NetBSD/segflush-386.c b/emu/NetBSD/segflush-386.c new file mode 100644 index 00000000..cdf0496b --- /dev/null +++ b/emu/NetBSD/segflush-386.c @@ -0,0 +1,9 @@ +#include "dat.h" + +int +segflush(void *a, ulong n) +{ + USED(a); + USED(n); + return 0; +} diff --git a/emu/NetBSD/segflush-power.c b/emu/NetBSD/segflush-power.c new file mode 100644 index 00000000..845d74f6 --- /dev/null +++ b/emu/NetBSD/segflush-power.c @@ -0,0 +1,12 @@ +#include <sys/types.h> +#include <machine/cpu.h> + +#include "dat.h" + + +int +segflush(void *a, ulong n) +{ + __syncicache(a, n); + return 0; +} diff --git a/lib9/getcallerpc-NetBSD-386.S b/lib9/getcallerpc-NetBSD-386.S index 09148627..08ea057e 100644 --- a/lib9/getcallerpc-NetBSD-386.S +++ b/lib9/getcallerpc-NetBSD-386.S @@ -1,8 +1,7 @@ - .file "getcallerpc-NetBSD-386.S" +#include <machine/asm.h> - .type getcallerpc,@function - .global getcallerpc -getcallerpc: +NENTRY(getcallerpc) movl 4(%esp), %eax movl -4(%eax), %eax ret + END(getcallerpc) diff --git a/lib9/getcallerpc-NetBSD-power.S b/lib9/getcallerpc-NetBSD-power.S new file mode 100644 index 00000000..cacbbc11 --- /dev/null +++ b/lib9/getcallerpc-NetBSD-power.S @@ -0,0 +1,6 @@ +#include <machine/asm.h> + +ENTRY_NOPROFILE(getcallerpc) + mflr %r3 + blr + END(getcallerpc) diff --git a/lib9/setfcr-NetBSD-386.S b/lib9/setfcr-NetBSD-386.S index d981f36a..06a6b78d 100644 --- a/lib9/setfcr-NetBSD-386.S +++ b/lib9/setfcr-NetBSD-386.S @@ -1,18 +1,18 @@ +#include <machine/asm.h> -#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): +NENTRY(setfcr) ENT xorb $0x3f, %al movl %eax, (%esp) fwait fldcw (%esp) RET + END(setfcr) -FN(getfcr): +NENTRY(getfcr) ENT fwait fstcw (%esp) @@ -20,15 +20,18 @@ FN(getfcr): andl $0xffff, %eax xorb $0x3f, %al RET + END(getfcr) -FN(getfsr): +NENTRY(getfsr) ENT fwait fstsw (%esp) movw (%esp), %ax andl $0xffff, %eax RET + END(getfsr) -FN(setfsr): +NENTRY(setfsr) fclex ret + END(setfsr) diff --git a/lib9/setfcr-NetBSD-power.S b/lib9/setfcr-NetBSD-power.S new file mode 100644 index 00000000..820fb29f --- /dev/null +++ b/lib9/setfcr-NetBSD-power.S @@ -0,0 +1,33 @@ +#include <machine/asm.h> + +ENTRY_NOPROFILE(getfcr) + mffs %f0 + stfd %f0,-16(%r1) + lwz %r3,-12(%r1) + blr + END(getfcr) + +ENTRY_NOPROFILE(getfsr) + mffs %f0 + stfd %f0,-16(%r1) + lwz %r3,-12(%r1) + blr + END(getfsr) + +ENTRY_NOPROFILE(setfsr) + sync + stw %r3,-12(%r1) + lfd %f0,-16(%r1) + mtfsf 0xff, %f0 + isync + blr + END(setfsr) + +ENTRY_NOPROFILE(setfcr) + sync + stw %r3,-12(%r1) + lfd %f0,-16(%r1) + mtfsf 0xff, %f0 + isync + blr + END(setfcr) diff --git a/libinterp/comp-power.c b/libinterp/comp-power.c index a53b0bf8..993542d7 100644 --- a/libinterp/comp-power.c +++ b/libinterp/comp-power.c @@ -31,6 +31,10 @@ #define MFSPR(s, d) gen(XO(31,339) | ((d)<<21) | ((s)<<11)) #define MTSPR(s, d) gen(XO(31,467) | ((s)<<21) | ((d)<<11)); +#define MFCR(d) gen(XO(31,19) | ((d)<<21)) +#define MTCRF(s, mask) gen(XO(31,144) | ((s)<<21) | ((mask)<<12)) +#define MTCR(s) MTCRF(s, 0xff) + #define SLWI(d,a,n) gen(slw((d),(a),(n),0)) #define LRET() gen(Oblr) @@ -1636,7 +1640,7 @@ comp(Inst *i) } enum { - PREFLEN = 20, /* max instruction words in comvec */ + PREFLEN = 64, /* max instruction words in comvec */ }; static void @@ -1649,6 +1653,45 @@ preamble(void) s = code = malloc(PREFLEN*sizeof(*code)); if(s == nil) error(exNomem); + +#ifdef __ELF__ + if(macjit) { + ulong *cp; + int r; + + /* + * ELF frame: + * 0(%sp) - back chain + * 4(%sp) - callee's LR save slot + * 8(%sp) to 36(%sp) - 8 words of parameter list area + * 40(%sp) to 48(%sp) - pad to 16 byte alignment/local vars + */ + mfspr(Ro1, Rlr); + AIRR(Ostw, Ro1, Rsp,4); + AIRR(Ostwu, Rsp, Rsp,-128); + + MFCR(Ro1); + AIRR(Ostw, Ro1, Rsp,52); + for (r = 14; r < 32; ++r) + AIRR(Ostw, r, Rsp,r*4); + + cp = code; + gen(Ob | Lk); + + AIRR(Olwz, Ro1, Rsp,52); + MTCR(Ro1); + for (r = 14; r < 32; ++r) + AIRR(Olwz, r, Rsp,r*4); + AIRR(Oaddi, Rsp, Rsp, 128); + + AIRR(Olwz, Ro1, Rsp,4); + mtspr(Rlr, Ro1); + LRET(); + + PATCH(cp); + } +#endif /* __ELF__ */ + ldc((ulong)&R, Rreg); SETR0(); mfspr(Rlink, Rlr); diff --git a/mkfiles/mkfile-NetBSD-386 b/mkfiles/mkfile-NetBSD-386 index 46d633d9..99ae6687 100644 --- a/mkfiles/mkfile-NetBSD-386 +++ b/mkfiles/mkfile-NetBSD-386 @@ -14,6 +14,7 @@ ASFLAGS= CC= cc -c CFLAGS= -g\ -O\ + -fno-strict-aliasing\ -Wno-deprecated-declarations -Wuninitialized -Wunused -Wreturn-type -Wimplicit\ -I$ROOT/NetBSD/386/include\ -I$ROOT/include\ diff --git a/mkfiles/mkfile-NetBSD-power b/mkfiles/mkfile-NetBSD-power new file mode 100644 index 00000000..1ac7e58e --- /dev/null +++ b/mkfiles/mkfile-NetBSD-power @@ -0,0 +1,30 @@ +TARGMODEL= Posix +TARGSHTYPE= sh +CPUS= power + +O= o +OS= o + +AR= ar +ARFLAGS= ruvs + +AS= cc -c +ASFLAGS= + +CC= cc -c +CFLAGS= -g\ + -O\ + -fno-strict-aliasing\ + -Wno-deprecated-declarations -Wuninitialized -Wunused -Wreturn-type -Wimplicit\ + -I$ROOT/NetBSD/power/include\ + -I$ROOT/include\ + -I/usr/X11R7/include + +ANSICPP= +LD= cc +LDFLAGS= + +SYSLIBS= + +YACC= iyacc +YFLAGS= -d |