sambuc/retrobsd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/RetroBSD/retrobsd

Browse Source
This commit is contained in:
Serge Vakulenko
2015-11-15 14:15:13 -08:00
parent 98f3efcb70 03ed62db5d
commit 4dd9308e25
23 changed files with 262 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile
View File

@@ -2,7 +2,7 @@ TOPSRC = $(shell cd ..; pwd)
SUBDIR = startup libc libm libcurses libtermlib libwiznet libreadline libgpanel
PROG = ar as aout ld nm ranlib size strip
CFLAGS += -std=gnu89 -fno-builtin -g -Werror -Wall -DCROSS -I. \
CFLAGS = -Os -std=gnu89 -fno-builtin -g -Werror -Wall -DCROSS -I. \
-idirafter $(TOPSRC)/include \
-idirafter $(TOPSRC)/src/cmd/ar \
-idirafter $(TOPSRC)/src/cmd/as

2
lib/libc/Makefile
View File

@@ -8,7 +8,7 @@ vpath %.c $(LIBCDIR)/mips/sys $(LIBCDIR)/gen $(LIBCDIR)/stdio \
$(LIBCDIR)/stdlib $(LIBCDIR)/string $(LIBCDIR)/inet \
$(LIBCDIR)/compat $(LIBCDIR)/runtime
CFLAGS += -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
CFLAGS = -Os -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
ASFLAGS += -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -I$(LIBCDIR)/mips/sys
# modules which can not use SYSCALL and must be assembled from sources. The

2
lib/libcurses/Makefile
View File

@@ -3,7 +3,7 @@ include $(TOPSRC)/target.mk
vpath %.c $(TOPSRC)/src/libcurses
CFLAGS += -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
CFLAGS = -Os -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
OBJS = addch.o addstr.o box.o clear.o clrtobot.o clrtoeol.o cr_put.o \
cr_tty.o curses.o delch.o deleteln.o delwin.o endwin.o erase.o \

2
lib/libgpanel/Makefile
View File

@@ -3,7 +3,7 @@ include $(TOPSRC)/target.mk
vpath %.c $(TOPSRC)/src/libgpanel
CFLAGS += -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
CFLAGS = -Os -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
OBJS = open.o clear.o pixel.o line.o rect.o fill.o circle.o \
image.o char.o text.o text_width.o

2
lib/libm/Makefile
View File

@@ -3,7 +3,7 @@ include $(TOPSRC)/target.mk
vpath %.c $(TOPSRC)/src/libm
CFLAGS += -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
CFLAGS = -Os -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
OBJS = asin.o atan.o exp.o erf.o floor.o fmod.o hypot.o j0.o j1.o \
jn.o log.o pow.o sin.o sinh.o sqrt.o tan.o tanh.o

2
lib/libreadline/Makefile
View File

@@ -3,7 +3,7 @@ include $(TOPSRC)/target.mk
vpath %.c $(TOPSRC)/src/libreadline
CFLAGS += -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
CFLAGS = -Os -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
OBJS = readline.o

2
lib/libtermlib/Makefile
View File

@@ -3,7 +3,7 @@ include $(TOPSRC)/target.mk
vpath %.c $(TOPSRC)/src/libtermlib
CFLAGS += -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
CFLAGS = -Os -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
OBJS = termcap.o tgoto.o tputs.o tcattr.o

2
lib/libwiznet/Makefile
View File

@@ -3,7 +3,7 @@ include $(TOPSRC)/target.mk
vpath %.c $(TOPSRC)/src/libwiznet
CFLAGS += -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
CFLAGS = -Os -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
OBJS = w5100.o socket.o ethernet.o client.o server.o udp.o

2
lib/startup/Makefile
View File

@@ -9,7 +9,7 @@ TOPSRC = $(shell cd ../..; pwd)
include $(TOPSRC)/target.mk
vpath %.c $(TOPSRC)/src/startup-mips
CFLAGS = -B$(TOPSRC)/lib/ -O -Wa,-x $(DEFS)
CFLAGS = -Os -B$(TOPSRC)/lib/ -Wa,-x $(DEFS)
OBJS = ../crt0.o

2
src/cmd/Makefile
View File

@@ -16,7 +16,7 @@ SUBDIR = adb adc-demo aout ar as awk basic calendar cc chflags \
man md5 med more nm passwd pdc picoc portio printf pwm \
ranlib re renice retroforth scm sed setty sh sl smallc \
smlrc smux stty sysctl test uname wiznet xargs \
zmodem gtest msec unixbench cron compress date2 tip \
zmodem gtest msec cron compress date2 tip \
talloc uucp
# /sbin

11
src/cmd/adb/format.c
View File

@@ -91,6 +91,7 @@ exform(fcount, ifp, itype, ptype)
struct {
long sa;
int sb, sc;
double sd; /* assume double = float = 32 bits */
} fw;
while (fcount > 0) {
@@ -225,18 +226,20 @@ exform(fcount, ifp, itype, ptype)
break;
case 'f':
*(double *)&fw = 0.0;
case 'F':
fw.sd = 0.0;
fw.sa = wx;
print("%-16.9f", *(double *)&fw);
print("%-16.9f", fw.sd);
dotinc = 4;
break;
#if 0
/* 64-bit double not supported */
case 'F':
fw.sa = wx;
print("%-32.18F", *(double *)&fw);
dotinc = 8;
break;
#endif
case 'n': case 'N':
printc('\n');
dotinc = 0;

3
src/cmd/ar/delete.c
View File

@@ -91,7 +91,8 @@ delete(argv)
SETCF(tfd, tname, afd, archive, NOPAD);
copy_ar(&cf, size);
(void)close(tfd);
(void)ftruncate(afd, size + SARMAG);
if (ftruncate(afd, size + SARMAG) < 0)
/* ignore */;
close_archive(afd);
if (*argv) {

3
src/cmd/ar/move.c
View File

@@ -136,7 +136,8 @@ move(argv)
cf.rfd = tfd3;
copy_ar(&cf, size);
(void)ftruncate(afd, tsize + SARMAG);
if (ftruncate(afd, tsize + SARMAG) < 0)
/* ignore */;
close_archive(afd);
if (*argv) {

3
src/cmd/ar/replace.c
View File

@@ -190,7 +190,8 @@ append: while ((file = *argv++) != 0) {
cf.rfd = tfd2;
copy_ar(&cf, size);
(void)ftruncate(afd, tsize + SARMAG);
if (ftruncate(afd, tsize + SARMAG) < 0)
/* ignore */;
close_archive(afd);
return(err);
}

3
src/cmd/ld/ld.c
View File

@@ -1568,7 +1568,8 @@ int main (argc, argv)
if (! ofilfnd) {
unlink ("a.out");
link ("l.out", "a.out");
if (link ("l.out", "a.out") < 0)
perror("a.out");
ofilename = "a.out";
}
delarg = errlev;

3
src/cmd/ranlib/ranlib.c
View File

@@ -385,7 +385,8 @@ int build()
(void)lseek(tfd, (off_t)0, SEEK_SET);
SETCF(tfd, tname, afd, archive, RPAD|WPAD);
copy_ar(&cf, size);
(void)ftruncate(afd, lseek(afd, (off_t)0, SEEK_CUR));
if (ftruncate(afd, lseek(afd, (off_t)0, SEEK_CUR)) < 0)
/* ignore */;
(void)close(tfd);
/* Set the time. */

3
src/cmd/strip.c
View File

@@ -50,7 +50,8 @@ strip(name)
head.a_reldata = 0;
head.a_syms = 0;
(void) lseek(f, (off_t)0, SEEK_SET);
(void) write(f, (char *)&head, sizeof (head));
if (write(f, (char *)&head, sizeof (head)) != sizeof (head))
/* ignore */;
out:
close(f);
}

2
src/cmd/unixbench/Makefile
View File

@@ -57,7 +57,7 @@ OPTON = -O2 -fomit-frame-pointer -fforce-addr -ffast-math -Wall
#CFLAGS = -DTIME -std1 -verbose -w0
## generic gcc CFLAGS. -DTIME must be included
CFLAGS = -DTIME -Wall -pedantic -ansi
#CFLAGS = -DTIME -Wall -pedantic -ansi
# local directories
PROGDIR = ./pgms

2
src/games/atc/Makefile
View File

@@ -9,7 +9,7 @@ TOPSRC = $(shell cd ../../..; pwd)
include $(TOPSRC)/target.mk
#include $(TOPSRC)/cross.mk
CFLAGS = -Os -g -Werror -Wall
CFLAGS += -Os -g -Werror -Wall
CFLAGS += -DBSD -DDEST=\"/games/lib/atc/\"
#CFLAGS += -DSYSV -DDEST=\"games/\"
YFLAGS = -d

207
src/libm/fmod.c
View File

@@ -1,27 +1,161 @@
#include <stdio.h>
#include <stdint.h>
#include "ieee.h"
typedef union {
double value;
struct {
uint32_t lo;
uint32_t hi;
} uns;
} union64_t;
/*
* Get two 32 bit ints from a double.
*/
#define UNPACK_DOUBLE(high,low,d) {\
union64_t u = {0}; \
u.value = d; \
high = u.uns.hi; \
low = u.uns.lo; \
}
/*
* Set a double from two 32 bit ints.
*/
#define PACK_DOUBLE(d,high,low) { \
union64_t u = {0}; \
u.uns.hi = high; \
u.uns.lo = low; \
d = u.value; \
}
typedef union {
float value;
uint32_t word;
} union32_t;
/*
* Get two 32 bit ints from a double.
*/
#define UNPACK_FLOAT(w,f) {\
union32_t u = {0}; \
u.value = f; \
w = u.word; \
}
/*
* Set a double from two 32 bit ints.
*/
#define PACK_FLOAT(f,w) { \
union32_t u = {0}; \
u.word = w; \
f = u.value; \
}
static const double one = 1.0, Zero[] = {0.0, -0.0,};
double fmod(double x, double y)
{
int32_t n=0, hx=0, hy=0, hz=0, ix=0, iy=0, sx=0, i=0;
uint32_t lx=0,ly=0,lz=0;
EXTRACT_WORDS(hx,lx,x);
EXTRACT_WORDS(hy,ly,y);
if (sizeof(float) == sizeof(double)) {
/*
* Double is 32-bit.
*/
UNPACK_FLOAT(hx,x);
UNPACK_FLOAT(hy,y);
sx = hx & 0x80000000; /* sign of x */
hx ^= sx; /* |x| */
hy &= 0x7fffffff; /* |y| */
/* purge off exception values */
if((hy|ly)==0||(hx>=0x7ff00000)|| /* y=0,or x not finite */
((hy|((ly|-ly)>>31))>0x7ff00000)) /* or y is NaN */
if (hy == 0 || hx >= 0x7f800000 || /* y=0, or x not finite */
hy > 0x7f800000) /* or y is NaN */
return (x*y) / (x*y);
if (hx < hy)
return x; /* |x| < |y| return x */
if (hx == hy)
return Zero[(uint32_t)sx >> 31]; /* |x| = |y| return x*0*/
/* determine ix = ilogb(x) */
if (hx < 0x00800000) { /* subnormal x */
for (ix= -126, i=hx<<8; i>0; i<<=1)
ix -= 1;
} else
ix = (hx >> 23) - 127;
/* determine iy = ilogb(y) */
if (hy < 0x00800000) { /* subnormal y */
for (iy= -126, i=hy<<8; i>=0; i<<=1)
iy -= 1;
} else iy = (hy >> 23) - 127;
/* set up {hx,lx}, {hy,ly} and align y to x */
if (ix >= -126)
hx = 0x00800000 | (0x007fffff & hx);
else { /* subnormal x, shift x to normal */
n = -126 - ix;
hx = hx << n;
}
if (iy >= -126)
hy = 0x00800000 | (0x007fffff & hy);
else { /* subnormal y, shift y to normal */
n = -126 - iy;
hy = hy << n;
}
/* fix point fmod */
n = ix - iy;
while (n--) {
hz = hx - hy;
if (hz < 0) {
hx = hx + hx;
} else {
if (hz == 0) /* return sign(x)*0 */
return Zero[(uint32_t)sx >> 31];
hx = hz + hz;
}
}
hz = hx - hy;
if (hz >= 0) {
hx = hz;
}
/* convert back to floating value and restore the sign */
if (hx == 0) /* return sign(x)*0 */
return Zero[(uint32_t)sx >> 31];
while (hx < 0x00800000) { /* normalize x */
hx = hx + hx;
iy -= 1;
}
if (iy >= -126) { /* normalize output */
hx = (hx - 0x00800000) | ((iy + 127) << 23);
PACK_FLOAT(x, hx | sx);
} else { /* subnormal output */
n = -126 - iy;
hx >>= n;
PACK_FLOAT(x, hx | sx);
x *= one; /* create necessary signal */
}
} else {
/*
* Double is 64-bit.
*/
uint32_t lx=0, ly=0, lz=0;
UNPACK_DOUBLE(hx, lx, x);
UNPACK_DOUBLE(hy, ly, y);
sx = hx & 0x80000000; /* sign of x */
hx ^= sx; /* |x| */
hy &= 0x7fffffff; /* |y| */
/* purge off exception values */
if ((hy | ly) == 0 || hx >= 0x7ff00000 || /* y=0,or x not finite */
(hy | ((ly | -ly) >> 31)) > 0x7ff00000) /* or y is NaN */
return (x*y) / (x*y);
if (hx <= hy) {
if((hx<hy)||(lx<ly)) return x; /* |x|<|y| return x */
if (hx < hy || lx < ly)
return x; /* |x| < |y| return x */
if (lx == ly)
return Zero[(uint32_t)sx >> 31]; /* |x| = |y| return x*0 */
}
@@ -29,20 +163,26 @@ double fmod(double x, double y)
/* determine ix = ilogb(x) */
if (hx < 0x00100000) { /* subnormal x */
if (hx == 0) {
for (ix = -1043, i=lx; i>0; i<<=1) ix -=1;
for (ix = -1043, i=lx; i>0; i<<=1)
ix -= 1;
} else {
for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1;
for (ix = -1022, i=hx<<11; i>0; i<<=1)
ix -= 1;
}
} else ix = (hx>>20)-1023;
} else
ix = (hx >> 20) - 1023;
/* determine iy = ilogb(y) */
if (hy < 0x00100000) { /* subnormal y */
if(hy==0) {
for (iy = -1043, i=ly; i>0; i<<=1) iy -=1;
for (iy = -1043, i=ly; i>0; i<<=1)
iy -= 1;
} else {
for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1;
for (iy = -1022,i=(hy<<11); i>0; i<<=1)
iy -= 1;
}
} else iy = (hy>>20)-1023;
} else
iy = (hy >> 20) - 1023;
/* set up {hx,lx}, {hy,ly} and align y to x */
if (ix >= -1022)
@@ -73,39 +213,56 @@ double fmod(double x, double y)
/* fix point fmod */
n = ix - iy;
while (n--) {
hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
if(hz<0){hx = hx+hx+(lx>>31); lx = lx+lx;}
else {
hz = hx - hy;
lz = lx - ly;
if (lx < ly)
hz -= 1;
if (hz < 0) {
hx = hx + hx + (lx >> 31);
lx = lx + lx;
} else {
if ((hz | lz) == 0) /* return sign(x)*0 */
return Zero[(uint32_t)sx >> 31];
hx = hz+hz+(lz>>31); lx = lz+lz;
hx = hz + hz + (lz >> 31);
lx = lz + lz;
}
}
hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
if(hz>=0) {hx=hz;lx=lz;}
hz = hx - hy;
lz = lx - ly;
if (lx < ly)
hz -= 1;
if (hz >= 0) {
hx = hz;
lx = lz;
}
/* convert back to floating value and restore the sign */
if ((hx | lx) == 0) /* return sign(x)*0 */
return Zero[(uint32_t)sx >> 31];
while (hx < 0x00100000) { /* normalize x */
hx = hx+hx+(lx>>31); lx = lx+lx;
hx = hx + hx + (lx >> 31);
lx = lx + lx;
iy -= 1;
}
if (iy >= -1022) { /* normalize output */
hx = ((hx-0x00100000)|((iy+1023)<<20));
INSERT_WORDS(x,hx|sx,lx);
hx = (hx - 0x00100000) | ((iy + 1023) << 20);
PACK_DOUBLE(x, hx | sx, lx);
} else { /* subnormal output */
n = -1022 - iy;
if (n <= 20) {
lx = (lx >> n) | ((uint32_t)hx << (32 - n));
hx >>= n;
} else if (n <= 31) {
lx = (hx<<(32-n))|(lx>>n); hx = sx;
lx = (hx << (32 - n)) | (lx >> n);
hx = sx;
} else {
lx = hx>>(n-32); hx = sx;
lx = hx >> (n - 32);
hx = sx;
}
INSERT_WORDS(x,hx|sx,lx);
PACK_DOUBLE(x, hx | sx, lx);
x *= one; /* create necessary signal */
}
}
return x; /* exact output */
}

23
src/libm/ieee.h
View File

@@ -1,23 +0,0 @@
/* Get two 32 bit ints from a double. */
#define EXTRACT_WORDS(high,low,d) \
high = *(unsigned long long*) &d; \
low = (*(unsigned long long*) &d) >> 32
/* Set a double from two 32 bit ints. */
#define INSERT_WORDS(d,high,low) \
*(unsigned long long*) &(x) = (unsigned long long) (high) << 32 | (low)
typedef union
{
double value;
struct
{
uint32_t lsw;
uint32_t msw;
} parts;
} ieee_double_shape_type;

5
target.mk
View File

@@ -80,8 +80,11 @@ TAGSFILE = tags
MANROFF = nroff -man -h -Tascii
ELF2AOUT = $(TOPSRC)/tools/elf2aout/elf2aout
CFLAGS = -O
CFLAGS = -Os
LDFLAGS += -N -nostartfiles -fno-dwarf2-cfi-asm -T$(TOPSRC)/src/elf32-mips.ld \
$(TOPSRC)/src/crt0.o -L$(TOPSRC)/src
LIBS = -lc
# Enable mips16e instruction set by default
CFLAGS += -mips16

2
tools/build/Makefile
View File

@@ -1,5 +1,5 @@
BOARD_LIST = duinomite fubarino max32 maximite maximite-color \
picadillo pinguino-micro sdxl snadpic
picadillo pinguino-micro sdxl snadpic ubw32
SKEL_SCRATCH = skeleton/linux32/pic32prog \
skeleton/linux64/pic32prog \