d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #103 from davidgiven/dtrg-warnings

Browse source 
Fix a lot of warnings.
This commit is contained in:
David Given 2018-06-18 22:31:35 +02:00 committed by GitHub
parent ddca7276c0 698613cd7d
commit 9eff7102e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
81 changed files with 1031 additions and 1227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lang/cem/libcc.ansi/stdlib/system.c
View file

@ -10,6 +10,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <signal.h> #include <signal.h>
extern char** environ;
extern int _fork(void); extern int _fork(void);
extern int _wait(int *); extern int _wait(int *);
extern void _exit(int); extern void _exit(int);
@ -18,7 +20,6 @@ extern void _close(int);
#define FAIL 127 #define FAIL 127
extern const char **environ;
static const char *exec_tab[] = { static const char *exec_tab[] = {
"sh", /* argv[0] */ "sh", /* argv[0] */
"-c", /* argument to the shell */ "-c", /* argument to the shell */
@ -39,7 +40,7 @@ system(const char *str)
_close(i); _close(i);
if (!str) str = "cd ."; /* just testing for a shell */ if (!str) str = "cd ."; /* just testing for a shell */
exec_tab[2] = str; /* fill in command */ exec_tab[2] = str; /* fill in command */
_execve("/bin/sh", exec_tab, environ); _execve("/bin/sh", exec_tab, (char const**) environ);
/* get here if execve fails ... */ /* get here if execve fails ... */
_exit(FAIL); /* see manual page */ _exit(FAIL); /* see manual page */
} }

1
lang/cem/libcc.ansi/string/strdup.c
View file

@ -4,6 +4,7 @@
*/ */
/* $Id$ */ /* $Id$ */
#include <stdlib.h>
#include <string.h> #include <string.h>
char* char*

1
lang/pc/comp/build.lua
View file

@ -111,6 +111,7 @@ cprogram {
"+scope_h", "+scope_h",
"+type_h", "+type_h",
"h+emheaders", "h+emheaders",
"lang/pc/include+headers",
"modules+headers", "modules+headers",
"modules/src/alloc+lib", "modules/src/alloc+lib",
"modules/src/em_code+lib_k", "modules/src/em_code+lib_k",

65
lang/pc/comp/proto.main
View file

@ -1,65 +0,0 @@
# $Id$
# C compilation part. Not to be called directly.
# Instead, it is to be called by the Makefile.
# SRC_DIR, UTIL_HOME, TARGET_HOME, CC, COPTIONS, LINT, LINTOPTIONS, LDOPTIONS,
# CC_AND_MKDEP, SUF, LIBSUF should be set here.
#PARAMS do not remove this line!
# PRODUCE is either e (readable EM) or k (compact EM)
PRODUCE = k
MDIR = $(TARGET_HOME)/modules
LIBDIR = $(MDIR)/lib
LINTLIBDIR = $(UTIL_HOME)/modules/lib
MALLOC = $(LIBDIR)/malloc.$(SUF)
EMLIB = $(LIBDIR)/libem_mes.$(LIBSUF) \
$(LIBDIR)/libem$(PRODUCE).$(LIBSUF) \
$(TARGET_HOME)/lib.bin/em_data.$(LIBSUF)
MODLIB = $(LIBDIR)/libinput.$(LIBSUF) \
$(LIBDIR)/libassert.$(LIBSUF) \
$(LIBDIR)/liballoc.$(LIBSUF) \
$(MALLOC) \
$(LIBDIR)/libflt.$(LIBSUF) \
$(LIBDIR)/libprint.$(LIBSUF) \
$(LIBDIR)/libstring.$(LIBSUF) \
$(LIBDIR)/libsystem.$(LIBSUF)
LIBS = $(EMLIB) $(MODLIB)
LINTLIBS = $(LINTLIBDIR)/$(LINTPREF)em_mes.$(LINTSUF) \
$(LINTLIBDIR)/$(LINTPREF)emk.$(LINTSUF) \
$(LINTLIBDIR)/$(LINTPREF)input.$(LINTSUF) \
$(LINTLIBDIR)/$(LINTPREF)assert.$(LINTSUF) \
$(LINTLIBDIR)/$(LINTPREF)alloc.$(LINTSUF) \
$(LINTLIBDIR)/$(LINTPREF)flt.$(LINTSUF) \
$(LINTLIBDIR)/$(LINTPREF)print.$(LINTSUF) \
$(LINTLIBDIR)/$(LINTPREF)string.$(LINTSUF) \
$(LINTLIBDIR)/$(LINTPREF)system.$(LINTSUF)
PROFILE =
INCLUDES = -I. -I$(SRC_DIR) -I$(TARGET_HOME)/modules/h -I$(TARGET_HOME)/h -I$(TARGET_HOME)/modules/pkg
CFLAGS = $(PROFILE) $(INCLUDES) $(COPTIONS) -DSTATIC=static
LINTFLAGS = $(INCLUDES) $(LINTOPTIONS) -DNORCSID -DSTATIC=static
LDFLAGS = $(PROFILE) $(LDOPTIONS)
# C_SRC and OBJ should be set here.
#LISTS do not remove this line!
all: main
clean:
rm -f *.$(SUF) main
lint:
$(LINT) $(LINTFLAGS) $(C_SRC) $(LINTLIBS)
main: $(OBJ)
$(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o main
# do not remove the next line; it is used for generating dependencies
#DEPENDENCIES

154
lang/pc/comp/proto.make
View file

@ -1,154 +0,0 @@
# $Id$
# make Pascal compiler
#PARAMS do not remove this line!
UTIL_BIN = \
$(UTIL_HOME)/bin
SRC_DIR = \
$(SRC_HOME)/lang/pc/comp
TABGEN= $(UTIL_BIN)/tabgen
LLGEN = $(UTIL_BIN)/LLgen
LLGENOPTIONS = \
-v
SRC_G = $(SRC_DIR)/program.g $(SRC_DIR)/declar.g \
$(SRC_DIR)/expression.g $(SRC_DIR)/statement.g
GEN_G = tokenfile.g
GFILES= $(GEN_G) $(SRC_G)
SRC_C = $(SRC_DIR)/LLlex.c $(SRC_DIR)/LLmessage.c $(SRC_DIR)/body.c \
$(SRC_DIR)/error.c $(SRC_DIR)/label.c $(SRC_DIR)/readwrite.c \
$(SRC_DIR)/main.c $(SRC_DIR)/tokenname.c $(SRC_DIR)/idf.c \
$(SRC_DIR)/input.c $(SRC_DIR)/type.c $(SRC_DIR)/def.c \
$(SRC_DIR)/misc.c $(SRC_DIR)/enter.c $(SRC_DIR)/progs.c \
$(SRC_DIR)/typequiv.c $(SRC_DIR)/node.c $(SRC_DIR)/cstoper.c \
$(SRC_DIR)/chk_expr.c $(SRC_DIR)/options.c $(SRC_DIR)/scope.c \
$(SRC_DIR)/desig.c $(SRC_DIR)/code.c $(SRC_DIR)/lookup.c \
$(SRC_DIR)/stab.c
GEN_C = tokenfile.c program.c declar.c expression.c statement.c \
symbol2str.c char.c Lpars.c casestat.c tmpvar.c next.c
CFILES= $(SRC_C) $(GEN_C)
SRC_H = $(SRC_DIR)/LLlex.h $(SRC_DIR)/chk_expr.h $(SRC_DIR)/class.h \
$(SRC_DIR)/const.h $(SRC_DIR)/debug.h $(SRC_DIR)/f_info.h \
$(SRC_DIR)/idf.h $(SRC_DIR)/input.h $(SRC_DIR)/main.h \
$(SRC_DIR)/misc.h $(SRC_DIR)/required.h $(SRC_DIR)/tokenname.h
GEN_H = errout.h idfsize.h numsize.h strsize.h target_sizes.h \
inputtype.h density.h nocross.h def.h debugcst.h \
type.h Lpars.h node.h dbsymtab.h scope.h desig.h
HFILES= $(GEN_H) $(SRC_H)
NEXTFILES = \
$(SRC_DIR)/def.H $(SRC_DIR)/type.H $(SRC_DIR)/node.H \
$(SRC_DIR)/scope.H $(SRC_DIR)/desig.H \
$(SRC_DIR)/tmpvar.C $(SRC_DIR)/casestat.C
all: make.main
make -f make.main main
install: all
cp main $(TARGET_HOME)/lib.bin/em_pc
cmp: all
-cmp main $(TARGET_HOME)/lib.bin/em_pc
opr:
make pr | opr
pr:
@pr $(SRC_DIR)/proto.make $(SRC_DIR)/proto.main Parameters \
$(SRC_DIR)/char.tab $(SRC_G) $(SRC_H) $(NEXTFILES) $(SRC_C)
lint: make.main
make -f make.main lint
Cfiles: hfiles LLfiles $(GEN_C) $(GEN_H) Makefile
echo $(CFILES) | tr ' ' '\012' > Cfiles
echo $(HFILES) | tr ' ' '\012' >> Cfiles
resolved: Cfiles
CC="$(CC)" UTIL_HOME="$(UTIL_HOME)" do_resolve `cat Cfiles` > Cfiles.new
-if cmp -s Cfiles Cfiles.new ; then rm -f Cfiles.new ; else mv Cfiles.new Cfiles ; fi
touch resolved
# there is no file called "dependencies"; we want dependencies checked
# every time. This means that make.main is made every time. Oh well ...
# it does not take much time.
dependencies: resolved
do_deps `grep '.c$$' Cfiles`
make.main: dependencies make_macros lists $(SRC_DIR)/proto.main
rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
cat *.dep >> make.main
make_macros: Makefile
echo 'SRC_DIR=$(SRC_DIR)' > make_macros
echo 'UTIL_HOME=$(UTIL_HOME)' >> make_macros
echo 'TARGET_HOME=$(TARGET_HOME)' >> make_macros
echo 'CC=$(CC)' >> make_macros
echo 'COPTIONS=$(COPTIONS)' >> make_macros
echo 'LDOPTIONS=$(LDOPTIONS)' >> make_macros
echo 'LINT=$(LINT)' >> make_macros
echo 'LINTSUF=$(LINTSUF)' >> make_macros
echo 'LINTPREF=$(LINTPREF)' >> make_macros
echo 'LINTOPTIONS=$(LINTOPTIONS)' >> make_macros
echo 'SUF=$(SUF)' >> make_macros
echo 'LIBSUF=$(LIBSUF)' >> make_macros
echo 'CC_AND_MKDEP=$(CC_AND_MKDEP)' >> make_macros
lists: Cfiles
echo "C_SRC = \\" > lists
echo $(CFILES) >> lists
echo "OBJ = \\" >> lists
echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
clean:
-make -f make.main clean
rm -f $(GEN_C) $(GEN_G) $(GEN_H) hfiles LLfiles Cfiles LL.output
rm -f resolved *.dep lists make.main make_macros
LLfiles: $(GFILES)
$(LLGEN) $(LLGENOPTIONS) $(GFILES)
@touch LLfiles
hfiles: Parameters $(SRC_DIR)/make.hfiles
$(SRC_DIR)/make.hfiles Parameters
touch hfiles
tokenfile.g: $(SRC_DIR)/tokenname.c $(SRC_DIR)/make.tokfile
$(SRC_DIR)/make.tokfile <$(SRC_DIR)/tokenname.c >tokenfile.g
symbol2str.c: $(SRC_DIR)/tokenname.c $(SRC_DIR)/make.tokcase
$(SRC_DIR)/make.tokcase <$(SRC_DIR)/tokenname.c >symbol2str.c
def.h: $(SRC_DIR)/make.allocd $(SRC_DIR)/def.H
$(SRC_DIR)/make.allocd < $(SRC_DIR)/def.H > def.h
type.h: $(SRC_DIR)/make.allocd $(SRC_DIR)/type.H
$(SRC_DIR)/make.allocd < $(SRC_DIR)/type.H > type.h
scope.h: $(SRC_DIR)/make.allocd $(SRC_DIR)/scope.H
$(SRC_DIR)/make.allocd < $(SRC_DIR)/scope.H > scope.h
node.h: $(SRC_DIR)/make.allocd $(SRC_DIR)/node.H
$(SRC_DIR)/make.allocd < $(SRC_DIR)/node.H > node.h
desig.h: $(SRC_DIR)/make.allocd $(SRC_DIR)/desig.H
$(SRC_DIR)/make.allocd < $(SRC_DIR)/desig.H > desig.h
tmpvar.c: $(SRC_DIR)/make.allocd $(SRC_DIR)/tmpvar.C
$(SRC_DIR)/make.allocd < $(SRC_DIR)/tmpvar.C > tmpvar.c
casestat.c: $(SRC_DIR)/make.allocd $(SRC_DIR)/casestat.C
$(SRC_DIR)/make.allocd < $(SRC_DIR)/casestat.C > casestat.c
next.c: $(NEXTFILES) $(SRC_DIR)/make.next
$(SRC_DIR)/make.next $(NEXTFILES) > next.c
char.c: $(SRC_DIR)/char.tab
$(TABGEN) -f$(SRC_DIR)/char.tab >char.c

4
lang/pc/include/build.lua Normal file
View file

@ -0,0 +1,4 @@
clibrary {
name = "headers",
hdrs = {"./*.h"}
}

131
lang/pc/include/pc.h Normal file
View file

@ -0,0 +1,131 @@
#ifndef PC_H
#define PC_H
#include "pc_err.h"
#include "pc_file.h"
#include "pc_math.h"
struct descr
{
int low;
int diff;
int size;
};
struct array_descr
{
int lbound;
unsigned n_elts_min_one;
unsigned size; /* doesn't really matter */
};
extern int _extflc;
extern struct file** _extfl;
extern struct file* _curfil;
extern int _pargc;
extern char** _pargv;
extern char** _penvp;
extern char* _m_lb; /* LB of _m_a_i_n */
extern struct file* _curfil; /* points to file struct in case of errors */
extern char *_ecvt(double value, int ndigit, int *decpt, int *sign);
extern char *_fcvt(double value, int ndigit, int *decpt, int *sign);
extern char *_wdw(struct file *f);
extern char *argv(int i);
extern char *strbuf(char *s);
extern char* _hol0(void);
extern double _abr(double r);
extern double _atn(double x);
extern double _cos(double x);
extern double _exp(double x);
extern double _fef(double fl, int* res);
extern double _fif(double f1, double f2, double* f3);
extern double _log(double x);
extern double _rdr(struct file *f);
extern double _rnd(double r);
extern double _sin(double x);
extern double _sqt(double x);
extern int _abi(int i);
extern int _asz(struct descr *dp);
extern int _bcp(int sz, unsigned char *y, unsigned char *x);
extern int _dvi(unsigned int j, unsigned int i);
extern int _efl(struct file *f);
extern int _eln(struct file *f);
extern int _fstdig(struct file *f);
extern int _getint(struct file *f);
extern int _getsig(struct file *f);
extern int _mdi(int j, int i);
extern int _nxtdig(struct file *f);
extern int _rdc(struct file *f);
extern int _rdi(struct file *f);
extern int argc(void);
extern int perrno(void);
extern int strfetch(char *s, int i);
extern int strlen(char *s);
extern int strtobuf(char *s, char *b, int l);
extern int uread(int fd, char *b, int n);
extern int uwrite(int fd, char *b, int n);
extern long _abl(long i);
extern long _dvil(unsigned long j, unsigned long i);
extern long _mdil(long j, long i);
extern long _mdl(long j, long i);
extern long _rdl(struct file *f);
extern void _ass(int line, int bool);
extern void _catch(unsigned erno);
extern void _cls(struct file *f);
extern void _cre(int sz, struct file *f);
extern void _dis(int n, void **ptr);
extern void _flush(struct file *f);
extern void _get(struct file *f);
extern void _hlt(int ecode);
extern void _incpt(struct file *f);
extern void _ini(char *args, int c, struct file **p, char *mainlb);
extern void _new(int n, void **ptr);
extern void _nfa(int bool);
extern void _opn(int sz, struct file *f);
extern void _outcpt(struct file *f);
extern void _pac(struct descr *ad, struct descr *zd, char *zp, int i, char *ap);
extern void _pag(struct file *f);
extern void _put(struct file *f);
extern void _rcka(struct array_descr *descr, int index);
extern void _rf(struct file *f);
extern void _rln(struct file *f);
extern void _sig(void (*)(unsigned int));
extern void _skipsp(struct file *f);
extern void _trp(int trapno);
extern void _unp(struct descr *ad, struct descr *zd, int i, char *ap, char *zp, int noext);
extern void _wf(struct file *f);
extern void _wln(struct file *f);
extern void _wrb(int b, struct file *f);
extern void _wrc(int c, struct file *f);
extern void _wrf(int n, int w, double r, struct file *f);
extern void _wri(int i, struct file *f);
extern void _wrl(long l, struct file *f);
extern void _wrr(double r, struct file *f);
extern void _wrs(int len, char *s, struct file *f);
extern void _wrz(char *s, struct file *f);
extern void _wsb(int w, int b, struct file* f);
extern void _wsc(int w, char c, struct file* f);
extern void _wsi(int w, int i, struct file* f);
extern void _wsl(int w, long l, struct file *f);
extern void _wsr(int w, double r, struct file *f);
extern void _wss(int w, int len, char* s, struct file* f);
extern void _wstrin(int width, int len, char* buf, struct file* f);
extern void _wsz(int w, char* s, struct file* f);
extern void _xcls(struct file *f);
extern void argshift(void);
extern void buff(struct file *f);
extern void diag(struct file *f);
extern void nobuff(struct file *f);
extern void notext(struct file *f);
extern void pclose(struct file *f);
extern void pcreat(struct file *f, char *s);
extern void popen(struct file *f, char *s);
extern void procentry(char *name);
extern void procexit(char *name);
extern void strstore(char *s, int i, int c);
#endif

0
h/pc_err.h → lang/pc/include/pc_err.h
View file

0
h/pc_file.h → lang/pc/include/pc_file.h
View file

0
h/pc_math.h → lang/pc/include/pc_math.h
View file

73
lang/pc/libpc/LIST
View file

@ -1,73 +0,0 @@
tail_pc.a
abi.c
abl.c
abr.c
arg.c
ass.c
asz.c
atn.c
bcp.c
bts.e
buff.c
clock.c
diag.c
dis.c
efl.c
eln.c
encaps.e
exp.c
get.c
gto.e
hlt.c
ini.c
catch.c
log.c
mdi.c
mdl.c
new.c
nobuff.c
notext.c
opn.c
hol0.e
pac.c
pclose.c
pcreat.c
pentry.c
perrno.c
pexit.c
popen.c
cls.c
put.c
rdc.c
rdl.c
rdr.c
rdi.c
rln.c
rf.c
rnd.c
sav.e
sig.e
sin.c
sqt.c
fef.e
string.c
trap.e
unp.c
uread.c
uwrite.c
wdw.c
incpt.c
wrc.c
wrf.c
wri.c
wrl.c
wrr.c
cvt.c
fif.e
wrz.c
wrs.c
outcpt.c
wf.c
nfa.c
rcka.c
trp.e

13
lang/pc/libpc/Makefile
View file

@ -1,13 +0,0 @@
# $Id$
head:
echo This Makefile needs arguments
clean:
rm -f *.old
opr:
make pr | opr
pr:
@pr Makefile *.[ec]

4
lang/pc/libpc/abi.c
View file

@ -17,7 +17,9 @@
*/ */
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include "pc.h"
int _abi(i) int i; { int _abi(int i)
{
return (i >= 0 ? i : -i); return (i >= 0 ? i : -i);
} }

4
lang/pc/libpc/abl.c
View file

@ -17,7 +17,9 @@
*/ */
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include "pc.h"
long _abl(i) long i; { long _abl(long i)
{
return (i >= 0 ? i : -i); return (i >= 0 ? i : -i);
} }

4
lang/pc/libpc/abr.c
View file

@ -17,7 +17,9 @@
*/ */
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include "pc.h"
double _abr(r) double r; { double _abr(double r)
{
return (r >= 0 ? r : -r); return (r >= 0 ? r : -r);
} }

27
lang/pc/libpc/arg.c
View file

@ -17,40 +17,31 @@
*/ */
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include "pc.h"
/* function argc:integer; extern; */ /* function argc:integer; extern; */
/* function argv(i:integer):string; extern; */ /* function argv(i:integer):string; extern; */
/* procedure argshift; extern; */ /* procedure argshift; extern; */
/* function environ(i:integer):string; extern; */ /* function environ(i:integer):string; extern; */
extern int _pargc; int argc(void)
extern char **_pargv; {
extern char **_penvp;
int argc() {
return (_pargc); return (_pargc);
} }
char *argv(i) { char* argv(int i)
{
if (i >= _pargc) if (i >= _pargc)
return (0); return (0);
return (_pargv[i]); return (_pargv[i]);
} }
argshift() { void argshift(void)
{
if (_pargc > 1) { if (_pargc > 1)
{
--_pargc; --_pargc;
_pargv++; _pargv++;
} }
} }
char *environ(i) {
char **p; char *q;
if (p = _penvp)
while (q = *p++)
if (i-- < 0)
return(q);
return(0);
}

11
lang/pc/libpc/ass.c
View file

@ -19,14 +19,13 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <em_abs.h> #include <em_abs.h>
#include <pc_err.h> #include "pc.h"
extern char *_hol0(); void _ass(int line, int bool)
extern _trp(); {
_ass(line,bool) int line,bool; { if (bool == 0)
{
if (bool==0) {
LINO = line; LINO = line;
_trp(EASS); _trp(EASS);
} }

11
lang/pc/libpc/asz.c
View file

@ -16,14 +16,11 @@
* *
*/ */
#include "pc.h"
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
struct descr { int _asz(struct descr* dp)
int low; {
int diff;
int size;
};
int _asz(dp) struct descr *dp; {
return (dp->size * (dp->diff + 1)); return (dp->size * (dp->diff + 1));
} }

26
lang/pc/libpc/atn.c
View file

@ -10,13 +10,9 @@
#define __NO_DEFS #define __NO_DEFS
#include <math.h> #include <math.h>
#if __STDC__ #include "pc.h"
#include <pc_math.h>
#endif
double double _atn(double x)
_atn(x)
double x;
{ {
/* Algorithm and coefficients from: /* Algorithm and coefficients from:
"Software manual for the elementary functions" "Software manual for the elementary functions"
@ -47,26 +43,30 @@ _atn(x)
int n; int n;
double g; double g;
if (neg) { if (neg)
{
x = -x; x = -x;
} }
if (x > 1.0) { if (x > 1.0)
{
x = 1.0 / x; x = 1.0 / x;
n = 2; n = 2;
} }
else n = 0; else
n = 0;
if (x > 0.26794919243112270647) { /* 2-sqtr(3) */ if (x > 0.26794919243112270647)
{ /* 2-sqtr(3) */
n = n + 1; n = n + 1;
x = (((0.73205080756887729353*x-0.5)-0.5)+x)/ x = (((0.73205080756887729353 * x - 0.5) - 0.5) + x) / (1.73205080756887729353 + x);
(1.73205080756887729353+x);
} }
/* ??? avoid underflow ??? */ /* ??? avoid underflow ??? */
g = x * x; g = x * x;
x += x * g * POLYNOM3(g, p) / POLYNOM4(g, q); x += x * g * POLYNOM3(g, p) / POLYNOM4(g, q);
if (n > 1) x = -x; if (n > 1)
x = -x;
x += a[n]; x += a[n];
return neg ? -x : x; return neg ? -x : x;
} }

7
lang/pc/libpc/bcp.c
View file

@ -17,10 +17,13 @@
*/ */
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include "pc.h"
int _bcp(sz,y,x) int sz; unsigned char *y,*x; { int _bcp(int sz, unsigned char* y, unsigned char* x)
{
while (--sz >= 0) { while (--sz >= 0)
{
if (*x < *y) if (*x < *y)
return (-1); return (-1);
if (*x++ > *y++) if (*x++ > *y++)

7
lang/pc/libpc/buff.c
View file

@ -18,13 +18,12 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include "pc.h"
extern _flush();
/* procedure buff(var f:file of ?); */ /* procedure buff(var f:file of ?); */
buff(f) struct file *f; { void buff(struct file* f)
{
int sz; int sz;
if ((f->flags & (0377 | WRBIT)) != (MAGIC | WRBIT)) if ((f->flags & (0377 | WRBIT)) != (MAGIC | WRBIT))

8
lang/pc/libpc/build.lua
View file

@ -17,9 +17,10 @@ for _, plat in ipairs(vars.plats) do
}, },
hdrs = {}, -- must be empty hdrs = {}, -- must be empty
deps = { deps = {
"lang/cem/libcc.ansi/headers+pkg",
"plat/"..plat.."/include+pkg",
"h+emheaders", "h+emheaders",
"lang/cem/libcc.ansi/headers+pkg",
"lang/pc/include+headers",
"plat/"..plat.."/include+pkg",
}, },
vars = { plat = plat } vars = { plat = plat }
} }
@ -29,7 +30,8 @@ for _, plat in ipairs(vars.plats) do
srcs = { "./head_pc.e" }, srcs = { "./head_pc.e" },
vars = { plat = plat }, vars = { plat = plat },
deps = { deps = {
"h+emheaders" "h+emheaders",
"lang/pc/include+headers",
} }
} }

45
lang/pc/libpc/catch.c
View file

@ -20,13 +20,10 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <em_abs.h> #include <em_abs.h>
#include <pc_err.h> #include "pc.h"
#include <pc_file.h>
/* to make it easier to patch ... */ static struct errm
extern struct file *_curfil; {
static struct errm {
int errno; int errno;
char* errmes; char* errmes;
} errors[] = { } errors[] = {
@ -82,14 +79,9 @@ static struct errm {
{ -1, 0 } { -1, 0 }
}; };
extern int _pargc;
extern char **_pargv;
extern char **_penvp;
extern char *_hol0(); void _catch(unsigned int erno)
extern _trp(); {
_catch(erno) unsigned erno; {
register struct errm* ep = &errors[0]; register struct errm* ep = &errors[0];
char *p, *q, *s, **qq; char *p, *q, *s, **qq;
char buf[20]; char buf[20];
@ -104,45 +96,54 @@ _catch(erno) unsigned erno; {
else else
*qq++ = _pargv[0]; *qq++ = _pargv[0];
while (ep->errno != erno && ep->errmes != 0) ep++; while (ep->errno != erno && ep->errmes != 0)
ep++;
p = buf; p = buf;
s = xbuf; s = xbuf;
if (i = LINO) { if (i = LINO)
{
*qq++ = ", "; *qq++ = ", ";
do do
*p++ = i % 10 + '0'; *p++ = i % 10 + '0';
while (i /= 10); while (i /= 10);
while (p > buf) *s++ = *--p; while (p > buf)
*s++ = *--p;
} }
*s++ = ':'; *s++ = ':';
*s++ = ' '; *s++ = ' ';
*s++ = '\0'; *s++ = '\0';
*qq++ = xbuf; *qq++ = xbuf;
if ((erno & ~037) == 0140 && (_curfil->flags&0377)==MAGIC) { if ((erno & ~037) == 0140 && (_curfil->flags & 0377) == MAGIC)
{
/* file error */ /* file error */
*qq++ = "file "; *qq++ = "file ";
*qq++ = _curfil->fname; *qq++ = _curfil->fname;
*qq++ = ": "; *qq++ = ": ";
} }
if (ep->errmes) *qq++ = ep->errmes; if (ep->errmes)
else { *qq++ = ep->errmes;
else
{
*qq++ = "error number "; *qq++ = "error number ";
*qq++ = s; *qq++ = s;
p = buf; p = buf;
if (j < 0) { if (j < 0)
{
j = -j; j = -j;
*s++ = '-'; *s++ = '-';
} }
do do
*p++ = j % 10 + '0'; *p++ = j % 10 + '0';
while (j /= 10); while (j /= 10);
while (p > buf) *s++ = *--p; while (p > buf)
*s++ = *--p;
*s = 0; *s = 0;
} }
*qq++ = "\n"; *qq++ = "\n";
*qq = 0; *qq = 0;
qq = pp; qq = pp;
while (q = *qq++) { while (q = *qq++)
{
p = q; p = q;
while (*p) while (*p)
p++; p++;

47
lang/pc/libpc/clock.c
View file

@ -1,47 +0,0 @@
/* $Id$ */
/*
* (c) copyright 1983 by the Vrije Universiteit, Amsterdam, The Netherlands.
*
* This product is part of the Amsterdam Compiler Kit.
*
* Permission to use, sell, duplicate or disclose this software must be
* obtained in writing. Requests for such permissions may be sent to
*
* Dr. Andrew S. Tanenbaum
* Wiskundig Seminarium
* Vrije Universiteit
* Postbox 7161
* 1007 MC Amsterdam
* The Netherlands
*
*/
/* Author: J.W. Stevenson */
/* function clock:integer; extern; */
extern int _times();
struct tbuf {
long utime;
long stime;
long cutime;
long cstime;
};
#ifndef EM_WSIZE
#define EM_WSIZE _EM_WSIZE
#endif
int clock() {
struct tbuf t;
_times(&t);
return( (int)(t.utime + t.stime) &
#if EM_WSIZE <= 2
077777
#else
0x7fffffffL
#endif
);
}

17
lang/pc/libpc/cls.c
View file

@ -20,19 +20,15 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern struct file *_curfil; void _xcls(struct file* f)
extern _trp(); {
extern _flush();
extern _outcpt();
_xcls(f) struct file *f; {
if ((f->flags & WRBIT) == 0) if ((f->flags & WRBIT) == 0)
return; return;
if ((f->flags & (TXTBIT|ELNBIT)) == TXTBIT) { if ((f->flags & (TXTBIT | ELNBIT)) == TXTBIT)
{
#ifdef CPM #ifdef CPM
*f->ptr = '\r'; *f->ptr = '\r';
_outcpt(f); _outcpt(f);
@ -43,7 +39,8 @@ _xcls(f) struct file *f; {
_flush(f); _flush(f);
} }
_cls(f) struct file *f; { void _cls(struct file* f)
{
#ifdef MAYBE #ifdef MAYBE
char* p; char* p;
#endif #endif

79
lang/pc/libpc/cvt.c
View file

@ -1,3 +1,5 @@
#include "pc.h"
/* $Id$ */ /* $Id$ */
#ifndef NOFLOAT #ifndef NOFLOAT
@ -8,26 +10,22 @@
#define DBL_MAX M_MAX_D #define DBL_MAX M_MAX_D
#endif #endif
static char *cvt(); static char* cvt(double value, int ndigit, int* decpt, int* sign, int ecvtflag);
#define NDIGITS 128 #define NDIGITS 128
char * char *_ecvt(double value, int ndigit, int *decpt, int *sign)
_ecvt(value, ndigit, decpt, sign)
double value;
int ndigit, *decpt, *sign;
{ {
return cvt(value, ndigit, decpt, sign, 1); return cvt(value, ndigit, decpt, sign, 1);
} }
char * char *_fcvt(double value, int ndigit, int *decpt, int *sign)
_fcvt(value, ndigit, decpt, sign)
double value;
int ndigit, *decpt, *sign;
{ {
return cvt(value, ndigit, decpt, sign, 0); return cvt(value, ndigit, decpt, sign, 0);
} }
static struct powers_of_10 { static struct powers_of_10
{
double pval; double pval;
double rpval; double rpval;
int exp; int exp;
@ -41,43 +39,51 @@ static struct powers_of_10 {
1.0e0, 1.0e0, 0 1.0e0, 1.0e0, 0
}; };
static char * static char* cvt(double value, int ndigit, int* decpt, int* sign, int ecvtflag)
cvt(value, ndigit, decpt, sign, ecvtflag)
double value;
int ndigit, *decpt, *sign;
{ {
static char buf[NDIGITS + 1]; static char buf[NDIGITS + 1];
register char* p = buf; register char* p = buf;
register char* pe; register char* pe;
if (ndigit < 0) ndigit = 0; if (ndigit < 0)
if (ndigit > NDIGITS) ndigit = NDIGITS; ndigit = 0;
if (ndigit > NDIGITS)
ndigit = NDIGITS;
pe = &buf[ndigit]; pe = &buf[ndigit];
buf[0] = '\0'; buf[0] = '\0';
*sign = 0; *sign = 0;
if (value < 0) { if (value < 0)
{
*sign = 1; *sign = 1;
value = -value; value = -value;
} }
*decpt = 0; *decpt = 0;
if (value >= DBL_MAX) { if (value >= DBL_MAX)
{
value = DBL_MAX; value = DBL_MAX;
} }
if (value != 0.0) { if (value != 0.0)
{
register struct powers_of_10* pp = &p10[0]; register struct powers_of_10* pp = &p10[0];
if (value >= 10.0) do { if (value >= 10.0)
while (value >= pp->pval) { do
{
while (value >= pp->pval)
{
value *= pp->rpval; value *= pp->rpval;
*decpt += pp->exp; *decpt += pp->exp;
} }
} while ((++pp)->exp > 0); } while ((++pp)->exp > 0);
pp = &p10[0]; pp = &p10[0];
if (value < 1.0) do { if (value < 1.0)
while (value * pp->pval < 10.0) { do
{
while (value * pp->pval < 10.0)
{
value *= pp->pval; value *= pp->pval;
*decpt -= pp->exp; *decpt -= pp->exp;
} }
@ -85,29 +91,38 @@ cvt(value, ndigit, decpt, sign, ecvtflag)
(*decpt)++; /* because now value in [1.0, 10.0) */ (*decpt)++; /* because now value in [1.0, 10.0) */
} }
if (! ecvtflag) { if (!ecvtflag)
{
/* for fcvt() we need ndigit digits behind the dot */ /* for fcvt() we need ndigit digits behind the dot */
pe += *decpt; pe += *decpt;
if (pe > &buf[NDIGITS]) pe = &buf[NDIGITS]; if (pe > &buf[NDIGITS])
pe = &buf[NDIGITS];
} }
while (p <= pe) { while (p <= pe)
{
*p++ = (int)value + '0'; *p++ = (int)value + '0';
value = 10.0 * (value - (int)value); value = 10.0 * (value - (int)value);
} }
if (pe >= buf) { if (pe >= buf)
{
p = pe; p = pe;
*p += 5; /* round of at the end */ *p += 5; /* round of at the end */
while (*p > '9') { while (*p > '9')
{
*p = '0'; *p = '0';
if (p > buf) ++*--p; if (p > buf)
else { ++*--p;
else
{
*p = '1'; *p = '1';
++*decpt; ++*decpt;
if (! ecvtflag) { if (!ecvtflag)
{
/* maybe add another digit at the end, /* maybe add another digit at the end,
because the point was shifted right because the point was shifted right
*/ */
if (pe > buf) *pe = '0'; if (pe > buf)
*pe = '0';
pe++; pe++;
} }
} }

6
lang/pc/libpc/diag.c
View file

@ -18,12 +18,12 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include "pc.h"
/* procedure diag(var f:text); */ /* procedure diag(var f:text); */
diag(f) struct file *f; { void diag(struct file* f)
{
f->ptr = f->bufadr; f->ptr = f->bufadr;
f->flags = WRBIT | EOFBIT | ELNBIT | TXTBIT | MAGIC; f->flags = WRBIT | EOFBIT | ELNBIT | TXTBIT | MAGIC;
f->fname = "DIAG"; f->fname = "DIAG";

10
lang/pc/libpc/efl.c
View file

@ -20,14 +20,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern struct file *_curfil; int _efl(struct file* f)
extern _trp(); {
extern _incpt();
int _efl(f) struct file *f; {
_curfil = f; _curfil = f;
if ((f->flags & 0377) != MAGIC) if ((f->flags & 0377) != MAGIC)

9
lang/pc/libpc/eln.c
View file

@ -18,13 +18,10 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern _trp(); int _eln(struct file* f)
extern _rf(); {
int _eln(f) struct file *f; {
_rf(f); _rf(f);
if (f->flags & EOFBIT) if (f->flags & EOFBIT)

56
lang/pc/libpc/exp.c
View file

@ -8,12 +8,10 @@
/* $Id$ */ /* $Id$ */
#define __NO_DEFS #define __NO_DEFS
#include <math.h> #include <math.h>
#include <pc_err.h> #include "pc.h"
extern _trp();
#if __STDC__ #if __STDC__
#include <float.h> #include <float.h>
#include <pc_math.h>
#define M_MIN_D DBL_MIN #define M_MIN_D DBL_MIN
#define M_MAX_D DBL_MAX #define M_MAX_D DBL_MAX
#define M_DMINEXP DBL_MIN_EXP #define M_DMINEXP DBL_MIN_EXP
@ -21,30 +19,31 @@ extern _trp();
#undef HUGE #undef HUGE
#define HUGE 1e1000 #define HUGE 1e1000
static double static double Ldexp(double fl, int exp)
Ldexp(fl,exp)
double fl;
int exp;
{ {
extern double _fef();
int sign = 1; int sign = 1;
int currexp; int currexp;
if (fl<0) { if (fl < 0)
{
fl = -fl; fl = -fl;
sign = -1; sign = -1;
} }
fl = _fef(fl, &currexp); fl = _fef(fl, &currexp);
exp += currexp; exp += currexp;
if (exp > 0) { if (exp > 0)
while (exp>30) { {
while (exp > 30)
{
fl *= (double)(1L << 30); fl *= (double)(1L << 30);
exp -= 30; exp -= 30;
} }
fl *= (double)(1L << exp); fl *= (double)(1L << exp);
} }
else { else
while (exp<-30) { {
while (exp < -30)
{
fl /= (double)(1L << 30); fl /= (double)(1L << 30);
exp += 30; exp += 30;
} }
@ -53,9 +52,7 @@ Ldexp(fl,exp)
return sign * fl; return sign * fl;
} }
double double _exp(double x)
_exp(x)
double x;
{ {
/* Algorithm and coefficients from: /* Algorithm and coefficients from:
"Software manual for the elementary functions" "Software manual for the elementary functions"
@ -78,26 +75,34 @@ _exp(x)
int n; int n;
int negative = x < 0; int negative = x < 0;
if (x <= M_LN_MIN_D) { if (x <= M_LN_MIN_D)
{
g = M_MIN_D / 4.0; g = M_MIN_D / 4.0;
if (g != 0.0) { if (g != 0.0)
{
/* unnormalized numbers apparently exist */ /* unnormalized numbers apparently exist */
if (x < (M_LN2 * (M_DMINEXP - 53))) return 0.0; if (x < (M_LN2 * (M_DMINEXP - 53)))
return 0.0;
} }
else { else
if (x < M_LN_MIN_D) return 0.0; {
if (x < M_LN_MIN_D)
return 0.0;
return M_MIN_D; return M_MIN_D;
} }
} }
if (x >= M_LN_MAX_D) { if (x >= M_LN_MAX_D)
if (x > M_LN_MAX_D) { {
if (x > M_LN_MAX_D)
{
_trp(EEXP); _trp(EEXP);
return HUGE; return HUGE;
} }
return M_MAX_D; return M_MAX_D;
} }
if (negative) x = -x; if (negative)
x = -x;
n = x * M_LOG2E + 0.5; /* 1/ln(2) = log2(e), 0.5 added for rounding */ n = x * M_LOG2E + 0.5; /* 1/ln(2) = log2(e), 0.5 added for rounding */
xn = n; xn = n;
@ -107,7 +112,8 @@ _exp(x)
g = ((x1 - xn * 0.693359375) + x2) - xn * (-2.1219444005469058277e-4); g = ((x1 - xn * 0.693359375) + x2) - xn * (-2.1219444005469058277e-4);
} }
if (negative) { if (negative)
{
g = -g; g = -g;
n = -n; n = -n;
} }

9
lang/pc/libpc/get.c
View file

@ -16,13 +16,10 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern _rf(); void _get(struct file* f)
extern _trp(); {
_get(f) struct file *f; {
_rf(f); _rf(f);
if (f->flags & EOFBIT) if (f->flags & EOFBIT)

11
lang/pc/libpc/hlt.c
View file

@ -18,14 +18,11 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include <unistd.h>
#include "pc.h"
extern struct file **_extfl; void _hlt(int ecode)
extern int _extflc; {
extern _cls();
extern _exit();
_hlt(ecode) int ecode; {
int i; int i;
for (i = 0; i < _extflc; i++) for (i = 0; i < _extflc; i++)

36
lang/pc/libpc/incpt.c
View file

@ -21,32 +21,35 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern _trp();
_incpt(f) struct file *f; {
void _incpt(struct file* f)
{
if (f->flags & EOFBIT) if (f->flags & EOFBIT)
_trp(EEOF); _trp(EEOF);
f->flags |= WINDOW; f->flags |= WINDOW;
f->flags &= ~ELNBIT; f->flags &= ~ELNBIT;
#ifdef CPM #ifdef CPM
do { do
{
#endif #endif
f->ptr += f->size; f->ptr += f->size;
if (f->count == 0) { if (f->count == 0)
{
f->ptr = f->bufadr; f->ptr = f->bufadr;
for(;;) { for (;;)
{
f->count = read(f->ufd, f->bufadr, f->buflen); f->count = read(f->ufd, f->bufadr, f->buflen);
if ( f->count<0 ) { if (f->count < 0)
if (errno != EINTR) _trp(EREAD) ; {
if (errno != EINTR)
_trp(EREAD);
continue; continue;
} }
break; break;
} }
if (f->count == 0) { if (f->count == 0)
{
f->flags |= EOFBIT; f->flags |= EOFBIT;
*f->ptr = '\0'; *f->ptr = '\0';
return; return;
@ -57,15 +60,18 @@ _incpt(f) struct file *f; {
#ifdef CPM #ifdef CPM
} while ((f->flags & TXTBIT) && *f->ptr == '\r'); } while ((f->flags & TXTBIT) && *f->ptr == '\r');
#endif #endif
if (f->flags & TXTBIT) { if (f->flags & TXTBIT)
{
if (*f->ptr & 0200) if (*f->ptr & 0200)
_trp(EASCII); _trp(EASCII);
if (*f->ptr == '\n') { if (*f->ptr == '\n')
{
f->flags |= ELNBIT; f->flags |= ELNBIT;
*f->ptr = ' '; *f->ptr = ' ';
} }
#ifdef CPM #ifdef CPM
if (*f->ptr == 26) { if (*f->ptr == 26)
{
f->flags |= EOFBIT; f->flags |= EOFBIT;
*f->ptr = 0; *f->ptr = 0;
} }

35
lang/pc/libpc/ini.c
View file

@ -18,33 +18,37 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern (*_sig())();
extern _catch();
struct file **_extfl;
int _extflc; /* number of external files */
char *_m_lb; /* LB of _m_a_i_n */
struct file *_curfil; /* points to file struct in case of errors */
int _pargc; int _pargc;
char** _pargv; char** _pargv;
char** _penvp; char** _penvp;
char* _m_lb; /* LB of _m_a_i_n */
struct file* _curfil; /* points to file struct in case of errors */
int _extflc;
struct file** _extfl;
int _fp_hook = 1; /* This is for Minix, but does not harm others */ int _fp_hook = 1; /* This is for Minix, but does not harm others */
_ini(args,c,p,mainlb) char *args,*mainlb; int c; struct file **p; { void _ini(char *args, int c, struct file **p, char *mainlb)
{
struct file* f; struct file* f;
_pargc= *(int *)args; args += sizeof (int); _pargc = *(int*)args;
_pargv= *(char ***)args; args += sizeof (char **); args += sizeof(int);
_pargv = *(char***)args;
args += sizeof(char**);
_penvp = *(char***)args; _penvp = *(char***)args;
_sig(_catch); _sig(_catch);
_extfl = p; _extfl = p;
_extflc = c; _extflc = c;
if( !c ) return; if (!c)
return;
_m_lb = mainlb; _m_lb = mainlb;
if ( (f = _extfl[0]) != (struct file *) 0) { if ((f = _extfl[0]) != (struct file*)0)
{
f->ptr = f->bufadr; f->ptr = f->bufadr;
f->flags = MAGIC | TXTBIT; f->flags = MAGIC | TXTBIT;
f->fname = "INPUT"; f->fname = "INPUT";
@ -53,7 +57,8 @@ _ini(args,c,p,mainlb) char *args,*mainlb; int c; struct file **p; {
f->count = 0; f->count = 0;
f->buflen = PC_BUFLEN; f->buflen = PC_BUFLEN;
} }
if ( (f = _extfl[1]) != (struct file *) 0) { if ((f = _extfl[1]) != (struct file*)0)
{
f->ptr = f->bufadr; f->ptr = f->bufadr;
f->flags = MAGIC | TXTBIT | WRBIT | EOFBIT | ELNBIT; f->flags = MAGIC | TXTBIT | WRBIT | EOFBIT | ELNBIT;
f->fname = "OUTPUT"; f->fname = "OUTPUT";

20
lang/pc/libpc/log.c
View file

@ -9,18 +9,15 @@
#define __NO_DEFS #define __NO_DEFS
#include <math.h> #include <math.h>
#include <pc_err.h> #include "pc.h"
#if __STDC__ #if __STDC__
#include <pc_math.h>
#include <float.h> #include <float.h>
#endif #endif
#undef HUGE #undef HUGE
#define HUGE 1e1000 #define HUGE 1e1000
double double _log(double x)
_log(x)
double x;
{ {
/* Algorithm and coefficients from: /* Algorithm and coefficients from:
"Software manual for the elementary functions" "Software manual for the elementary functions"
@ -38,26 +35,29 @@ _log(x)
1.0 1.0
}; };
extern double _fef();
double znum, zden, z, w; double znum, zden, z, w;
int exponent; int exponent;
if (x <= 0) { if (x <= 0)
{
_trp(ELOG); _trp(ELOG);
return -HUGE; return -HUGE;
} }
x = _fef(x, &exponent); x = _fef(x, &exponent);
if (x > M_1_SQRT2) { if (x > M_1_SQRT2)
{
znum = (x - 0.5) - 0.5; znum = (x - 0.5) - 0.5;
zden = x * 0.5 + 0.5; zden = x * 0.5 + 0.5;
} }
else { else
{
znum = x - 0.5; znum = x - 0.5;
zden = znum * 0.5 + 0.5; zden = znum * 0.5 + 0.5;
exponent--; exponent--;
} }
z = znum/zden; w = z * z; z = znum / zden;
w = z * z;
x = z + z * w * (POLYNOM2(w, a) / POLYNOM3(w, b)); x = z + z * w * (POLYNOM2(w, a) / POLYNOM3(w, b));
z = exponent; z = exponent;
x += z * (-2.121944400546905827679e-4); x += z * (-2.121944400546905827679e-4);

46
lang/pc/libpc/mdi.c
View file

@ -18,11 +18,10 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_err.h> #include "pc.h"
extern _trp(); int _mdi(int j, int i)
{
int _mdi(j,i) int j,i; {
if (j <= 0) if (j <= 0)
_trp(EMOD); _trp(EMOD);
@ -32,7 +31,8 @@ int _mdi(j,i) int j,i; {
return (i); return (i);
} }
long _mdil(j,i) long j,i; { long _mdil(long j, long i)
{
if (j <= 0) if (j <= 0)
_trp(EMOD); _trp(EMOD);
@ -42,30 +42,42 @@ long _mdil(j,i) long j,i; {
return (i); return (i);
} }
int _dvi(j, i) unsigned int j,i; { int _dvi(unsigned int j, unsigned int i)
{
int neg = 0; int neg = 0;
if ((int)j < 0) { if ((int)j < 0)
j = -(int)j; neg = 1; {
j = -(int)j;
neg = 1;
} }
if ((int)i < 0) { if ((int)i < 0)
i = -(int)i; neg = !neg; {
i = -(int)i;
neg = !neg;
} }
i = i / j; i = i / j;
if (neg) return -(int)i; if (neg)
return -(int)i;
return i; return i;
} }
long _dvil(j, i) unsigned long j,i; { long _dvil(unsigned long j, unsigned long i)
{
int neg = 0; int neg = 0;
if ((long)j < 0) { if ((long)j < 0)
j = -(long)j; neg = 1; {
j = -(long)j;
neg = 1;
} }
if ((long)i < 0) { if ((long)i < 0)
i = -(long)i; neg = !neg; {
i = -(long)i;
neg = !neg;
} }
i = i / j; i = i / j;
if (neg) return -(long)i; if (neg)
return -(long)i;
return i; return i;
} }

7
lang/pc/libpc/mdl.c
View file

@ -18,11 +18,10 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_err.h> #include "pc.h"
extern _trp(); long _mdl(long j, long i)
{
long _mdl(j,i) long j,i; {
if (j <= 0) if (j <= 0)
_trp(EMOD); _trp(EMOD);

4
lang/pc/libpc/new.c
View file

@ -1,8 +1,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <em_abs.h> #include <em_abs.h>
#include <pc_err.h> #include "pc.h"
extern void _trp(int); /* called on error */
void _new(int n, void** ptr) void _new(int n, void** ptr)
{ {

9
lang/pc/libpc/nfa.c
View file

@ -6,11 +6,10 @@
/* Author: Hans van Eck */ /* Author: Hans van Eck */
#include <pc_err.h> #include "pc.h"
extern _trp(); void _nfa(int bool)
_nfa(bool)
{ {
if (! bool) _trp(EFUNASS); if (!bool)
_trp(EFUNASS);
} }

7
lang/pc/libpc/nobuff.c
View file

@ -18,13 +18,12 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include "pc.h"
extern _flush();
/* procedure nobuff(var f:file of ?); */ /* procedure nobuff(var f:file of ?); */
nobuff(f) struct file *f; { void nobuff(struct file* f)
{
if ((f->flags & (0377 | WRBIT)) != (MAGIC | WRBIT)) if ((f->flags & (0377 | WRBIT)) != (MAGIC | WRBIT))
return; return;

5
lang/pc/libpc/notext.c
View file

@ -16,8 +16,9 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
notext(f) struct file *f; { void notext(struct file* f)
{
f->flags &= ~TXTBIT; f->flags &= ~TXTBIT;
} }

59
lang/pc/libpc/opn.c
View file

@ -19,24 +19,15 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern struct file **_extfl; static int tmpfil(void)
extern int _extflc; {
extern struct file *_curfil;
extern int _pargc;
extern char **_pargv;
extern char **_penvp;
extern _cls();
extern _xcls();
extern _trp();
static int tmpfil() {
static char namebuf[] = "/tmp/plf.xxxxx"; static char namebuf[] = "/tmp/plf.xxxxx";
int i; char *p,*q; int i;
char *p, *q;
i = getpid(); i = getpid();
p = namebuf; p = namebuf;
@ -53,43 +44,55 @@ static int tmpfil() {
goto error; goto error;
if ((i = open(p, 2)) < 0) if ((i = open(p, 2)) < 0)
goto error; goto error;
if (remove(p) != 0) if (unlink(p) != 0)
error: _trp(EREWR); error:
_trp(EREWR);
return (i); return (i);
} }
static int initfl(descr,sz,f) int descr; int sz; struct file *f; { static int initfl(int descr, int sz, struct file* f)
{
int i; int i;
_curfil = f; _curfil = f;
if (sz == 0) { if (sz == 0)
{
sz++; sz++;
descr |= TXTBIT; descr |= TXTBIT;
} }
for (i = 0; i < _extflc; i++) for (i = 0; i < _extflc; i++)
if (f == _extfl[i]) if (f == _extfl[i])
break; break;
if (i >= _extflc) { /* local file */ if (i >= _extflc)
{ /* local file */
f->fname = "LOCAL"; f->fname = "LOCAL";
if ((descr & WRBIT) == 0 && (f->flags & 0377) == MAGIC) { if ((descr & WRBIT) == 0 && (f->flags & 0377) == MAGIC)
{
_xcls(f); _xcls(f);
if (lseek(f->ufd, (long)0, 0) == -1) if (lseek(f->ufd, (long)0, 0) == -1)
_trp(ERESET); _trp(ERESET);
} else { }
else
{
_cls(f); _cls(f);
f->ufd = tmpfil(); f->ufd = tmpfil();
} }
} else { /* external file */ }
else
{ /* external file */
if (--i <= 0) if (--i <= 0)
return (0); return (0);
if (i >= _pargc) if (i >= _pargc)
_trp(EARGC); _trp(EARGC);
f->fname = _pargv[i]; f->fname = _pargv[i];
_cls(f); _cls(f);
if ((descr & WRBIT) == 0) { if ((descr & WRBIT) == 0)
{
if ((f->ufd = open(f->fname, 0)) < 0) if ((f->ufd = open(f->fname, 0)) < 0)
_trp(ERESET); _trp(ERESET);
} else { }
else
{
if ((f->ufd = creat(f->fname, 0644)) < 0) if ((f->ufd = creat(f->fname, 0644)) < 0)
_trp(EREWR); _trp(EREWR);
} }
@ -101,13 +104,15 @@ static int initfl(descr,sz,f) int descr; int sz; struct file *f; {
return (1); return (1);
} }
_opn(sz,f) int sz; struct file *f; { void _opn(int sz, struct file* f)
{
if (initfl(MAGIC, sz, f)) if (initfl(MAGIC, sz, f))
f->count = 0; f->count = 0;
} }
_cre(sz,f) int sz; struct file *f; { void _cre(int sz, struct file* f)
{
if (initfl(WRBIT | EOFBIT | ELNBIT | MAGIC, sz, f)) if (initfl(WRBIT | EOFBIT | ELNBIT | MAGIC, sz, f))
f->count = f->buflen; f->count = f->buflen;

11
lang/pc/libpc/outcpt.c
View file

@ -21,12 +21,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern _trp(); void _flush(struct file* f)
{
_flush(f) struct file *f; {
int i, n; int i, n;
f->ptr = f->bufadr; f->ptr = f->bufadr;
@ -40,7 +38,8 @@ _flush(f) struct file *f; {
_trp(EWRITE); _trp(EWRITE);
} }
_outcpt(f) struct file *f; { void _outcpt(struct file* f)
{
f->flags &= ~ELNBIT; f->flags &= ~ELNBIT;
f->ptr += f->size; f->ptr += f->size;

28
lang/pc/libpc/pac.c
View file

@ -18,9 +18,7 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_err.h> #include "pc.h"
extern _trp();
#define assert(x) /* nothing */ #define assert(x) /* nothing */
@ -28,34 +26,32 @@ extern _trp();
#define EM_WSIZE _EM_WSIZE #define EM_WSIZE _EM_WSIZE
#endif #endif
struct descr { void _pac(struct descr *ad, struct descr *zd, char *zp, int i, char *ap)
int low; {
int diff;
int size;
};
_pac(ad,zd,zp,i,ap) int i; struct descr *ad,*zd; char *zp,*ap; { if (zd->diff > ad->diff || (i -= ad->low) < 0 || (i + zd->diff) > ad->diff)
if (zd->diff > ad->diff ||
(i -= ad->low) < 0 ||
(i+zd->diff) > ad->diff)
_trp(EPACK); _trp(EPACK);
ap += (i * ad->size); ap += (i * ad->size);
i = (zd->diff + 1) * zd->size; i = (zd->diff + 1) * zd->size;
if (zd->size == 1) { if (zd->size == 1)
{
int* aptmp = (int*)ap; int* aptmp = (int*)ap;
assert(ad->size == EM_WSIZE); assert(ad->size == EM_WSIZE);
while (--i >= 0) while (--i >= 0)
*zp++ = *aptmp++; *zp++ = *aptmp++;
#if EM_WSIZE > 2 #if EM_WSIZE > 2
} else if (zd->size == 2) { }
else if (zd->size == 2)
{
int* aptmp = (int*)ap; int* aptmp = (int*)ap;
short* zptmp = (short*)zp; short* zptmp = (short*)zp;
assert(ad->size == EM_WSIZE); assert(ad->size == EM_WSIZE);
while (--i >= 0) while (--i >= 0)
*zptmp++ = *aptmp++; *zptmp++ = *aptmp++;
#endif #endif
} else { }
else
{
assert(ad->size == zd->size); assert(ad->size == zd->size);
while (--i >= 0) while (--i >= 0)
*zp++ = *ap++; *zp++ = *ap++;

7
lang/pc/libpc/pclose.c
View file

@ -16,12 +16,11 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
extern _cls();
/* procedure pclose(var f:file of ??); */ /* procedure pclose(var f:file of ??); */
pclose(f) struct file *f; { void pclose(struct file* f)
{
_cls(f); _cls(f);
} }

9
lang/pc/libpc/pcreat.c
View file

@ -19,15 +19,12 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <unistd.h> #include <unistd.h>
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern _cls();
extern _trp();
/* procedure pcreat(var f:text; s:string); */ /* procedure pcreat(var f:text; s:string); */
pcreat(f,s) struct file *f; char *s; { void pcreat(struct file* f, char* s)
{
_cls(f); /* initializes _curfil */ _cls(f); /* initializes _curfil */
f->ptr = f->bufadr; f->ptr = f->bufadr;

10
lang/pc/libpc/pentry.c
View file

@ -18,14 +18,10 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include "pc.h"
extern struct file **_extfl; void procentry(char* name)
extern _wrs(); {
extern _wrz();
extern _wln();
procentry(name) char *name; {
struct file* f; struct file* f;
f = _extfl[1]; f = _extfl[1];

4
lang/pc/libpc/perrno.c
View file

@ -19,7 +19,9 @@
/* function perrno:integer; extern; */ /* function perrno:integer; extern; */
#include <errno.h> #include <errno.h>
#include "pc.h"
int perrno() { int perrno(void)
{
return (errno); return (errno);
} }

10
lang/pc/libpc/pexit.c
View file

@ -16,14 +16,10 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
extern struct file **_extfl; void procexit(char* name)
extern _wrs(); {
extern _wrz();
extern _wln();
procexit(name) char *name; {
struct file* f; struct file* f;
f = _extfl[1]; f = _extfl[1];

14
lang/pc/libpc/popen.c
View file

@ -18,17 +18,13 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include "fcntl.h"
#include <pc_err.h> #include "pc.h"
extern _cls();
extern _trp();
extern int _open();
/* procedure popen(var f:text; s:string); */ /* procedure popen(var f:text; s:string); */
popen(f,s) struct file *f; char *s; { void popen(struct file* f, char* s)
{
_cls(f); /* initializes _curfil */ _cls(f); /* initializes _curfil */
f->ptr = f->bufadr; f->ptr = f->bufadr;
f->flags = TXTBIT | MAGIC; f->flags = TXTBIT | MAGIC;
@ -36,6 +32,6 @@ popen(f,s) struct file *f; char *s; {
f->size = 1; f->size = 1;
f->count = 0; f->count = 0;
f->buflen = PC_BUFLEN; f->buflen = PC_BUFLEN;
if ((f->ufd = _open(s,0)) < 0) if ((f->ufd = open(s, 0)) < 0)
_trp(ERESET); _trp(ERESET);
} }

8
lang/pc/libpc/put.c
View file

@ -16,12 +16,10 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
extern _wf(); void _put(struct file* f)
extern _outcpt(); {
_put(f) struct file *f; {
_wf(f); _wf(f);
_outcpt(f); _outcpt(f);
} }

15
lang/pc/libpc/rcka.c
View file

@ -6,20 +6,11 @@
/* Author: Hans van Eck */ /* Author: Hans van Eck */
#include "pc.h"
#include <em_abs.h> #include <em_abs.h>
extern _trp(); void _rcka(struct array_descr* descr, int index)
struct array_descr {
int lbound;
unsigned n_elts_min_one;
unsigned size; /* doesn't really matter */
};
_rcka(descr, index)
struct array_descr *descr;
{ {
if( index < descr->lbound || if (index < descr->lbound || index > (int)descr->n_elts_min_one + descr->lbound)
index > (int) descr->n_elts_min_one + descr->lbound )
_trp(EARRAY); _trp(EARRAY);
} }

8
lang/pc/libpc/rdc.c
View file

@ -16,12 +16,10 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
extern _rf(); int _rdc(struct file* f)
extern _incpt(); {
int _rdc(f) struct file *f; {
int c; int c;
_rf(f); _rf(f);

28
lang/pc/libpc/rdi.c
View file

@ -18,19 +18,16 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern _trp(); void _skipsp(struct file* f)
extern _rf(); {
extern _incpt();
_skipsp(f) struct file *f; {
while ((*f->ptr == ' ') || (*f->ptr == '\t')) while ((*f->ptr == ' ') || (*f->ptr == '\t'))
_incpt(f); _incpt(f);
} }
int _getsig(f) struct file *f; { int _getsig(struct file* f)
{
int sign; int sign;
if ((sign = (*f->ptr == '-')) || *f->ptr == '+') if ((sign = (*f->ptr == '-')) || *f->ptr == '+')
@ -38,18 +35,21 @@ int _getsig(f) struct file *f; {
return (sign); return (sign);
} }
int _fstdig(f) struct file *f; { int _fstdig(struct file* f)
{
int ch; int ch;
ch = *f->ptr - '0'; ch = *f->ptr - '0';
if ((unsigned) ch > 9) { if ((unsigned)ch > 9)
{
_trp(EDIGIT); _trp(EDIGIT);
ch = 0; ch = 0;
} }
return (ch); return (ch);
} }
int _nxtdig(f) struct file *f; { int _nxtdig(struct file* f)
{
int ch; int ch;
_incpt(f); _incpt(f);
@ -59,7 +59,8 @@ int _nxtdig(f) struct file *f; {
return (ch); return (ch);
} }
int _getint(f) struct file *f; { int _getint(struct file* f)
{
int is_signed, i, ch; int is_signed, i, ch;
is_signed = _getsig(f); is_signed = _getsig(f);
@ -71,7 +72,8 @@ int _getint(f) struct file *f; {
return (is_signed ? i : -i); return (is_signed ? i : -i);
} }
int _rdi(f) struct file *f; { int _rdi(struct file* f)
{
_rf(f); _rf(f);
_skipsp(f); _skipsp(f);
return (_getint(f)); return (_getint(f));

14
lang/pc/libpc/rdl.c
View file

@ -18,16 +18,12 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include "pc.h"
extern _rf(); long _rdl(struct file* f)
extern _skipsp(); {
extern int _getsig(); int is_signed, ch;
extern int _fstdig(); long l;
extern int _nxtdig();
long _rdl(f) struct file *f; {
int is_signed,ch; long l;
_rf(f); _rf(f);
_skipsp(f); _skipsp(f);

29
lang/pc/libpc/rdr.c
View file

@ -18,22 +18,15 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_file.h> #include "pc.h"
#define BIG 1e17 #define BIG 1e17
extern _rf();
extern _incpt();
extern _skipsp();
extern int _getsig();
extern int _getint();
extern int _fstdig();
extern int _nxtdig();
static double r; static double r;
static int pow10; static int pow10;
static dig(ch) int ch; { static void dig(int ch)
{
if (r > BIG) if (r > BIG)
pow10++; pow10++;
@ -41,8 +34,11 @@ static dig(ch) int ch; {
r = r * 10.0 + ch; r = r * 10.0 + ch;
} }
double _rdr(f) struct file *f; { double _rdr(struct file* f)
int i; double e; int is_signed,ch; {
int i;
double e;
int is_signed, ch;
r = 0; r = 0;
pow10 = 0; pow10 = 0;
@ -53,15 +49,18 @@ double _rdr(f) struct file *f; {
do do
dig(ch); dig(ch);
while ((ch = _nxtdig(f)) >= 0); while ((ch = _nxtdig(f)) >= 0);
if (*f->ptr == '.') { if (*f->ptr == '.')
{
_incpt(f); _incpt(f);
ch = _fstdig(f); ch = _fstdig(f);
do { do
{
dig(ch); dig(ch);
pow10--; pow10--;
} while ((ch = _nxtdig(f)) >= 0); } while ((ch = _nxtdig(f)) >= 0);
} }
if ((*f->ptr == 'e') || (*f->ptr == 'E')) { if ((*f->ptr == 'e') || (*f->ptr == 'E'))
{
_incpt(f); _incpt(f);
pow10 += _getint(f); pow10 += _getint(f);
} }

10
lang/pc/libpc/rf.c
View file

@ -16,14 +16,10 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern struct file *_curfil; void _rf(struct file* f)
extern _trp(); {
extern _incpt();
_rf(f) struct file *f; {
_curfil = f; _curfil = f;
if ((f->flags & 0377) != MAGIC) if ((f->flags & 0377) != MAGIC)

8
lang/pc/libpc/rln.c
View file

@ -16,12 +16,10 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
extern _rf(); void _rln(struct file* f)
extern _incpt(); {
_rln(f) struct file *f; {
_rf(f); _rf(f);
while ((f->flags & ELNBIT) == 0) while ((f->flags & ELNBIT) == 0)

5
lang/pc/libpc/rnd.c
View file

@ -16,6 +16,9 @@
* *
*/ */
double _rnd(r) double r; { #include "pc.h"
double _rnd(double r)
{
return (r + (r < 0 ? -0.5 : 0.5)); return (r + (r < 0 ? -0.5 : 0.5));
} }

39
lang/pc/libpc/sin.c
View file

@ -9,14 +9,9 @@
#define __NO_DEFS #define __NO_DEFS
#include <math.h> #include <math.h>
#include "pc.h"
#if __STDC__ static double sinus(double x, int cos_flag)
#include <pc_math.h>
#endif
static double
sinus(x, cos_flag)
double x;
{ {
/* Algorithm and coefficients from: /* Algorithm and coefficients from:
"Software manual for the elementary functions" "Software manual for the elementary functions"
@ -38,15 +33,18 @@ sinus(x, cos_flag)
double y; double y;
int neg = 0; int neg = 0;
if (x < 0) { if (x < 0)
{
x = -x; x = -x;
neg = 1; neg = 1;
} }
if (cos_flag) { if (cos_flag)
{
neg = 0; neg = 0;
y = M_PI_2 + x; y = M_PI_2 + x;
} }
else y = x; else
y = x;
/* ??? avoid loss of significance, if y is too large, error ??? */ /* ??? avoid loss of significance, if y is too large, error ??? */
@ -60,11 +58,12 @@ sinus(x, cos_flag)
#define A2 -8.908910206761537356617e-6 #define A2 -8.908910206761537356617e-6
{ {
double x1, x2; double x1, x2;
extern double _fif();
_fif(y, 1.0, &y); _fif(y, 1.0, &y);
if (_fif(y, 0.5, &x1)) neg = !neg; if (_fif(y, 0.5, &x1))
if (cos_flag) y -= 0.5; neg = !neg;
if (cos_flag)
y -= 0.5;
x2 = _fif(x, 1.0, &x1); x2 = _fif(x, 1.0, &x1);
x = x1 - y * A1; x = x1 - y * A1;
x += x2; x += x2;
@ -73,7 +72,8 @@ sinus(x, cos_flag)
#undef A2 #undef A2
} }
if (x < 0) { if (x < 0)
{
neg = !neg; neg = !neg;
x = -x; x = -x;
} }
@ -85,17 +85,14 @@ sinus(x, cos_flag)
return neg ? -x : x; return neg ? -x : x;
} }
double double _sin(double x)
_sin(x)
double x;
{ {
return sinus(x, 0); return sinus(x, 0);
} }
double double _cos(double x)
_cos(x)
double x;
{ {
if (x < 0) x = -x; if (x < 0)
x = -x;
return sinus(x, 1); return sinus(x, 1);
} }

41
lang/pc/libpc/sqt.c
View file

@ -8,35 +8,35 @@
/* $Id$ */ /* $Id$ */
#define __NO_DEFS #define __NO_DEFS
#include <math.h> #include <math.h>
#include <pc_err.h> #include "pc.h"
extern _trp();
#define NITER 5 #define NITER 5
static double static double Ldexp(double fl, int exp)
Ldexp(fl,exp)
double fl;
int exp;
{ {
extern double _fef();
int sign = 1; int sign = 1;
int currexp; int currexp;
if (fl<0) { if (fl < 0)
{
fl = -fl; fl = -fl;
sign = -1; sign = -1;
} }
fl = _fef(fl, &currexp); fl = _fef(fl, &currexp);
exp += currexp; exp += currexp;
if (exp > 0) { if (exp > 0)
while (exp>30) { {
while (exp > 30)
{
fl *= (double)(1L << 30); fl *= (double)(1L << 30);
exp -= 30; exp -= 30;
} }
fl *= (double)(1L << exp); fl *= (double)(1L << exp);
} }
else { else
while (exp<-30) { {
while (exp < -30)
{
fl /= (double)(1L << 30); fl /= (double)(1L << 30);
exp += 30; exp += 30;
} }
@ -45,27 +45,28 @@ Ldexp(fl,exp)
return sign * fl; return sign * fl;
} }
double double _sqt(double x)
_sqt(x)
double x;
{ {
extern double _fef();
int exponent; int exponent;
double val; double val;
if (x <= 0) { if (x <= 0)
if (x < 0) _trp(ESQT); {
if (x < 0)
_trp(ESQT);
return 0; return 0;
} }
val = _fef(x, &exponent); val = _fef(x, &exponent);
if (exponent & 1) { if (exponent & 1)
{
exponent--; exponent--;
val *= 2; val *= 2;
} }
val = Ldexp(val + 1.0, exponent / 2 - 1); val = Ldexp(val + 1.0, exponent / 2 - 1);
/* was: val = (val + 1.0)/2.0; val = Ldexp(val, exponent/2); */ /* was: val = (val + 1.0)/2.0; val = Ldexp(val, exponent/2); */
for (exponent = NITER - 1; exponent >= 0; exponent--) { for (exponent = NITER - 1; exponent >= 0; exponent--)
{
val = (val + x / val) / 2.0; val = (val + x / val) / 2.0;
} }
return val; return val;

20
lang/pc/libpc/string.c
View file

@ -16,19 +16,24 @@
* *
*/ */
#include "pc.h"
/* function strbuf(var b:charbuf):string; */ /* function strbuf(var b:charbuf):string; */
char *strbuf(s) char *s; { char* strbuf(char* s)
{
return (s); return (s);
} }
/* function strtobuf(s:string; var b:charbuf; blen:integer):integer; */ /* function strtobuf(s:string; var b:charbuf; blen:integer):integer; */
int strtobuf(s,b,l) char *s,*b; { int strtobuf(char* s, char* b, int l)
{
int i; int i;
i = 0; i = 0;
while (--l>=0) { while (--l >= 0)
{
if ((*b++ = *s++) == 0) if ((*b++ = *s++) == 0)
break; break;
i++; i++;
@ -38,7 +43,8 @@ int strtobuf(s,b,l) char *s,*b; {
/* function strlen(s:string):integer; */ /* function strlen(s:string):integer; */
int strlen(s) char *s; { int strlen(char* s)
{
int i; int i;
i = 0; i = 0;
@ -49,12 +55,14 @@ int strlen(s) char *s; {
/* function strfetch(s:string; i:integer):char; */ /* function strfetch(s:string; i:integer):char; */
int strfetch(s,i) char *s; { int strfetch(char* s, int i)
{
return (s[i - 1]); return (s[i - 1]);
} }
/* procedure strstore(s:string; i:integer; c:char); */ /* procedure strstore(s:string; i:integer; c:char); */
strstore(s,i,c) char *s; { void strstore(char* s, int i, int c)
{
s[i - 1] = c; s[i - 1] = c;
} }

40
lang/pc/libpc/unp.c
View file

@ -18,9 +18,7 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_err.h> #include "pc.h"
extern _trp();
#define assert(x) /* nothing */ #define assert(x) /* nothing */
@ -28,36 +26,38 @@ extern _trp();
#define EM_WSIZE _EM_WSIZE #define EM_WSIZE _EM_WSIZE
#endif #endif
struct descr { void _unp(struct descr *ad, struct descr *zd, int i, char *ap, char *zp, int noext)
int low; {
int diff;
int size;
};
_unp(ad,zd,i,ap,zp,noext) int i; struct descr *ad,*zd; char *ap,*zp; int noext; { if (zd->diff > ad->diff || (i -= ad->low) < 0 || (i + zd->diff) > ad->diff)
if (zd->diff > ad->diff ||
(i -= ad->low) < 0 ||
(i+zd->diff) > ad->diff)
_trp(EUNPACK); _trp(EUNPACK);
ap += (i * ad->size); ap += (i * ad->size);
i = (zd->diff + 1) * zd->size; i = (zd->diff + 1) * zd->size;
if (zd->size == 1) { if (zd->size == 1)
{
int* aptmp = (int*)ap; int* aptmp = (int*)ap;
assert(ad->size == EM_WSIZE); assert(ad->size == EM_WSIZE);
while (--i >= 0) while (--i >= 0)
if (noext) *aptmp++ = *zp++ & 0377; if (noext)
else *aptmp++ = *zp++; *aptmp++ = *zp++ & 0377;
else
*aptmp++ = *zp++;
#if EM_WSIZE > 2 #if EM_WSIZE > 2
} else if (zd->size == 2) { }
else if (zd->size == 2)
{
int* aptmp = (int*)ap; int* aptmp = (int*)ap;
short* zptmp = (short*)zp; short* zptmp = (short*)zp;
assert(ad->size == EM_WSIZE); assert(ad->size == EM_WSIZE);
while (--i >= 0) while (--i >= 0)
if (noext) *aptmp++ = *zptmp++ & 0177777; if (noext)
else *aptmp++ = *zptmp++; *aptmp++ = *zptmp++ & 0177777;
else
*aptmp++ = *zptmp++;
#endif #endif
} else { }
else
{
assert(ad->size == zd->size); assert(ad->size == zd->size);
while (--i >= 0) while (--i >= 0)
*ap++ = *zp++; *ap++ = *zp++;

4
lang/pc/libpc/uread.c
View file

@ -20,7 +20,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include "pc.h"
int uread(fd,b,n) char *b; int fd,n; { int uread(int fd, char* b, int n)
{
return (read(fd, b, n)); return (read(fd, b, n));
} }

4
lang/pc/libpc/uwrite.c
View file

@ -20,7 +20,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include "pc.h"
int uwrite(fd,b,n) char *b; int fd,n; { int uwrite(int fd, char* b, int n)
{
return (write(fd, b, n)); return (write(fd, b, n));
} }

9
lang/pc/libpc/wdw.c
View file

@ -16,13 +16,10 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
extern struct file *_curfil;
extern _incpt();
char *_wdw(f) struct file *f; {
char* _wdw(struct file* f)
{
_curfil = f; _curfil = f;
if ((f->flags & (WINDOW | WRBIT | 0377)) == MAGIC) if ((f->flags & (WINDOW | WRBIT | 0377)) == MAGIC)
_incpt(f); _incpt(f);

9
lang/pc/libpc/wf.c
View file

@ -16,13 +16,10 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
#include <pc_err.h>
extern struct file *_curfil; void _wf(struct file* f)
extern _trp(); {
_wf(f) struct file *f; {
_curfil = f; _curfil = f;
if ((f->flags & 0377) != MAGIC) if ((f->flags & 0377) != MAGIC)

14
lang/pc/libpc/wrc.c
View file

@ -16,18 +16,17 @@
* *
*/ */
#include <pc_file.h> #include "pc.h"
extern _wf(); void _wrc(int c, struct file* f)
extern _outcpt(); {
_wrc(c,f) int c; struct file *f; {
*f->ptr = c; *f->ptr = c;
_wf(f); _wf(f);
_outcpt(f); _outcpt(f);
} }
_wln(f) struct file *f; { void _wln(struct file* f)
{
#ifdef CPM #ifdef CPM
_wrc('\r', f); _wrc('\r', f);
#endif #endif
@ -35,7 +34,8 @@ _wln(f) struct file *f; {
f->flags |= ELNBIT; f->flags |= ELNBIT;
} }
_pag(f) struct file *f; { void _pag(struct file* f)
{
_wrc('\014', f); _wrc('\014', f);
f->flags |= ELNBIT; f->flags |= ELNBIT;
} }

22
lang/pc/libpc/wrf.c
View file

@ -18,11 +18,7 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_err.h> #include "pc.h"
#include <pc_file.h>
extern _wstrin();
extern char *_fcvt();
#define assert(x) /* nothing */ #define assert(x) /* nothing */
@ -36,10 +32,14 @@ extern char *_fcvt();
#define FILL_CHAR '0' /* char printed if all of _fcvt() used */ #define FILL_CHAR '0' /* char printed if all of _fcvt() used */
#define BUFSIZE HUGE_DIG + PREC_DIG + 3 #define BUFSIZE HUGE_DIG + PREC_DIG + 3
_wrf(n,w,r,f) int n,w; double r; struct file *f; { void _wrf(int n, int w, double r, struct file* f)
char *p,*b; int s,d; char buf[BUFSIZE]; {
char *p, *b;
int s, d;
char buf[BUFSIZE];
if ( n < 0 || w < 0) _trp(EWIDTH); if (n < 0 || w < 0)
_trp(EWIDTH);
p = buf; p = buf;
if (n > PREC_DIG) if (n > PREC_DIG)
n = PREC_DIG; n = PREC_DIG;
@ -55,12 +55,14 @@ _wrf(n,w,r,f) int n,w; double r; struct file *f; {
while (--d > 0); while (--d > 0);
if (n > 0) if (n > 0)
*p++ = '.'; *p++ = '.';
while (++d <= 0) { while (++d <= 0)
{
if (--n < 0) if (--n < 0)
break; break;
*p++ = '0'; *p++ = '0';
} }
while (--n >= 0) { while (--n >= 0)
{
*p++ = (*b ? *b++ : FILL_CHAR); *p++ = (*b ? *b++ : FILL_CHAR);
assert(p <= buf + BUFSIZE); assert(p <= buf + BUFSIZE);
} }

24
lang/pc/libpc/wri.c
View file

@ -16,10 +16,7 @@
* *
*/ */
#include <pc_err.h> #include "pc.h"
#include <pc_file.h>
extern _wstrin();
#ifndef EM_WSIZE #ifndef EM_WSIZE
#ifdef _EM_WSIZE #ifdef _EM_WSIZE
@ -47,13 +44,19 @@ extern _wstrin();
Something wrong here ! Something wrong here !
#endif #endif
_wsi(w,i,f) int w,i; struct file *f; { void _wsi(int w, int i, struct file* f)
char *p; int j; char buf[SZ]; {
char* p;
int j;
char buf[SZ];
if (w < 0) _trp(EWIDTH); if (w < 0)
_trp(EWIDTH);
p = &buf[SZ]; p = &buf[SZ];
if ((j=i) < 0) { if ((j = i) < 0)
if (i == MININT) { {
if (i == MININT)
{
_wstrin(w, SZ, STRMININT, f); _wstrin(w, SZ, STRMININT, f);
return; return;
} }
@ -67,6 +70,7 @@ _wsi(w,i,f) int w,i; struct file *f; {
_wstrin(w, (int)(&buf[SZ] - p), p, f); _wstrin(w, (int)(&buf[SZ] - p), p, f);
} }
_wri(i,f) int i; struct file *f; { void _wri(int i, struct file* f)
{
_wsi(SZ, i, f); _wsi(SZ, i, f);
} }

30
lang/pc/libpc/wrl.c
View file

@ -18,26 +18,29 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_err.h> #include "pc.h"
#include <pc_file.h> #include <limits.h>
extern _wstrin(); void _wsl(int w, long l, struct file* f)
{
char *p, c;
long j;
char buf[11];
#define MAXNEGLONG -2147483648 if (w < 0)
_trp(EWIDTH);
_wsl(w,l,f) int w; long l; struct file *f; {
char *p,c; long j; char buf[11];
if (w < 0) _trp(EWIDTH);
p = &buf[11]; p = &buf[11];
if ((j=l) < 0) { if ((j = l) < 0)
if (l == MAXNEGLONG) { {
if (l == LONG_MIN)
{
_wstrin(w, 11, "-2147483648", f); _wstrin(w, 11, "-2147483648", f);
return; return;
} }
j = -j; j = -j;
} }
do { do
{
c = j % 10; c = j % 10;
*--p = c + '0'; *--p = c + '0';
} while (j /= 10); } while (j /= 10);
@ -46,6 +49,7 @@ _wsl(w,l,f) int w; long l; struct file *f; {
_wstrin(w, (int)(&buf[11] - p), p, f); _wstrin(w, (int)(&buf[11] - p), p, f);
} }
_wrl(l,f) long l; struct file *f; { void _wrl(long l, struct file* f)
{
_wsl(11, l, f); _wsl(11, l, f);
} }

31
lang/pc/libpc/wrr.c
View file

@ -18,18 +18,18 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_err.h> #include "pc.h"
#include <pc_file.h>
extern _wstrin();
extern char *_ecvt();
#define PREC_DIG 80 /* maximum digits produced by _ecvt() */ #define PREC_DIG 80 /* maximum digits produced by _ecvt() */
_wsr(w,r,f) int w; double r; struct file *f; { void _wsr(int w, double r, struct file* f)
char *p,*b; int s,d,i; char buf[PREC_DIG+7]; {
char *p, *b;
int s, d, i;
char buf[PREC_DIG + 7];
if (w < 0) _trp(EWIDTH); if (w < 0)
_trp(EWIDTH);
p = buf; p = buf;
if ((i = w - 6) < 2) if ((i = w - 6) < 2)
i = 2; i = 2;
@ -43,18 +43,22 @@ _wsr(w,r,f) int w; double r; struct file *f; {
*p++ = *b++; *p++ = *b++;
*p++ = 'e'; *p++ = 'e';
d--; d--;
if (d < 0) { if (d < 0)
{
d = -d; d = -d;
*p++ = '-'; *p++ = '-';
} else }
else
*p++ = '+'; *p++ = '+';
if (d >= 1000) { if (d >= 1000)
{
*p++ = '*'; *p++ = '*';
*p++ = '*'; *p++ = '*';
*p++ = '*'; *p++ = '*';
} }
else { else
{
*p++ = '0' + d / 100; *p++ = '0' + d / 100;
*p++ = '0' + (d / 10) % 10; *p++ = '0' + (d / 10) % 10;
*p++ = '0' + d % 10; *p++ = '0' + d % 10;
@ -62,6 +66,7 @@ _wsr(w,r,f) int w; double r; struct file *f; {
_wstrin(w, (int)(p - buf), buf, f); _wstrin(w, (int)(p - buf), buf, f);
} }
_wrr(r,f) double r; struct file *f; { void _wrr(double r, struct file* f)
{
_wsr(13, r, f); _wsr(13, r, f);
} }

42
lang/pc/libpc/wrs.c
View file

@ -18,51 +18,55 @@
/* Author: J.W. Stevenson */ /* Author: J.W. Stevenson */
#include <pc_err.h> #include "pc.h"
#include <pc_file.h>
extern _wf();
extern _outcpt();
_wstrin(width,len,buf,f) int width,len; char *buf; struct file *f; {
void _wstrin(int width, int len, char* buf, struct file* f)
{
_wf(f); _wf(f);
for (width -= len; width>0; width--) { for (width -= len; width > 0; width--)
{
*f->ptr = ' '; *f->ptr = ' ';
_outcpt(f); _outcpt(f);
} }
while (--len >= 0) { while (--len >= 0)
{
*f->ptr = *buf++; *f->ptr = *buf++;
_outcpt(f); _outcpt(f);
} }
} }
_wsc(w,c,f) int w; char c; struct file *f; { void _wsc(int w, char c, struct file* f)
{
if (w < 0) _trp(EWIDTH); if (w < 0)
_trp(EWIDTH);
_wss(w, 1, &c, f); _wss(w, 1, &c, f);
} }
_wss(w,len,s,f) int w,len; char *s; struct file *f; { void _wss(int w, int len, char* s, struct file* f)
{
if (w < 0 || len < 0) _trp(EWIDTH); if (w < 0 || len < 0)
_trp(EWIDTH);
if (w < len) if (w < len)
len = w; len = w;
_wstrin(w, len, s, f); _wstrin(w, len, s, f);
} }
_wrs(len,s,f) int len; char *s; struct file *f; { void _wrs(int len, char* s, struct file* f)
if (len < 0) _trp(EWIDTH); {
if (len < 0)
_trp(EWIDTH);
_wss(len, len, s, f); _wss(len, len, s, f);
} }
_wsb(w,b,f) int w,b; struct file *f; { void _wsb(int w, int b, struct file* f)
{
if (b) if (b)
_wss(w, 4, "true", f); _wss(w, 4, "true", f);
else else
_wss(w, 5, "false", f); _wss(w, 5, "false", f);
} }
_wrb(b,f) int b; struct file *f; { void _wrb(int b, struct file* f)
{
_wsb(5, b, f); _wsb(5, b, f);
} }

21
lang/pc/libpc/wrz.c
View file

@ -16,23 +16,24 @@
* *
*/ */
#include <pc_err.h> #include "pc.h"
#include <pc_file.h>
extern _wss(); void _wsz(int w, char* s, struct file* f)
extern _wrs(); {
_wsz(w,s,f) int w; char *s; struct file *f; {
char* p; char* p;
if (w < 0) _trp(EWIDTH); if (w < 0)
for (p=s; *p; p++); _trp(EWIDTH);
for (p = s; *p; p++)
;
_wss(w, (int)(p - s), s, f); _wss(w, (int)(p - s), s, f);
} }
_wrz(s,f) char *s; struct file *f; { void _wrz(char* s, struct file* f)
{
char* p; char* p;
for (p=s; *p; p++); for (p = s; *p; p++)
;
_wrs((int)(p - s), s, f); _wrs((int)(p - s), s, f);
} }

4
plat/build.lua
View file

@ -11,7 +11,7 @@ definerule("ackfile",
suffix = { type="string", optional=true }, suffix = { type="string", optional=true },
}, },
function (e) function (e)
local em = e.vars.plat:find("^em") local em = (e.vars.plat or ""):find("^em")
local suffix = e.suffix or (em and ".m" or ".o") local suffix = e.suffix or (em and ".m" or ".o")
local c = "-c"..suffix local c = "-c"..suffix
local plat = e.vars.plat local plat = e.vars.plat
@ -47,7 +47,7 @@ definerule("acklibrary",
deps = { type="targets", default={} }, deps = { type="targets", default={} },
}, },
function (e) function (e)
local em = e.vars.plat:find("^em") local em = (e.vars.plat or ""):find("^em")
return clibrary { return clibrary {
name = e.name, name = e.name,
srcs = e.srcs, srcs = e.srcs,

1
plat/cpm/include/unistd.h
View file

@ -45,6 +45,7 @@ extern int open(const char* path, int access, ...);
extern int creat(const char* path, mode_t mode); extern int creat(const char* path, mode_t mode);
extern int read(int fd, void* buffer, size_t count); extern int read(int fd, void* buffer, size_t count);
extern int write(int fd, void* buffer, size_t count); extern int write(int fd, void* buffer, size_t count);
extern int unlink(const char* path);
/* Unimplemented system calls (these are just prototypes to let the library /* Unimplemented system calls (these are just prototypes to let the library
* compile). */ * compile). */

1
plat/pc86/include/unistd.h
View file

@ -46,6 +46,7 @@ extern int open(const char* path, int access, ...);
extern int creat(const char* path, mode_t mode); extern int creat(const char* path, mode_t mode);
extern int read(int fd, void* buffer, size_t count); extern int read(int fd, void* buffer, size_t count);
extern int write(int fd, void* buffer, size_t count); extern int write(int fd, void* buffer, size_t count);
extern int unlink(const char* path);
/* Unimplemented system calls (these are just prototypes to let the library /* Unimplemented system calls (these are just prototypes to let the library
* compile). */ * compile). */

1
plat/pdpv7/include/unistd.h
View file

@ -67,6 +67,7 @@ extern int open(const char* path, int access, ...);
extern int creat(const char* path, mode_t mode); extern int creat(const char* path, mode_t mode);
extern int read(int fd, void* buffer, size_t count); extern int read(int fd, void* buffer, size_t count);
extern int write(int fd, void* buffer, size_t count); extern int write(int fd, void* buffer, size_t count);
extern int unlink(const char* path);
/* Unimplemented system calls (these are just prototypes to let the library /* Unimplemented system calls (these are just prototypes to let the library
* compile). */ * compile). */

2
plat/rpi/include/unistd.h
View file

@ -67,6 +67,7 @@ extern int open(const char* path, int access, ...);
extern int creat(const char* path, mode_t mode); extern int creat(const char* path, mode_t mode);
extern int read(int fd, void* buffer, size_t count); extern int read(int fd, void* buffer, size_t count);
extern int write(int fd, void* buffer, size_t count); extern int write(int fd, void* buffer, size_t count);
extern int unlink(const char* path);
/* Unimplemented system calls (these are just prototypes to let the library /* Unimplemented system calls (these are just prototypes to let the library
* compile). */ * compile). */
@ -89,6 +90,7 @@ typedef int sig_atomic_t;
typedef void (*sighandler_t)(int); typedef void (*sighandler_t)(int);
extern sighandler_t signal(int signum, sighandler_t handler); extern sighandler_t signal(int signum, sighandler_t handler);
extern int raise(int signum); extern int raise(int signum);
extern int kill(pid_t pid, int sig);
/* Select */ /* Select */

8
tests/plat/lib/test_b.c
View file

@ -1,8 +1,8 @@
#include <stdint.h> #include <stdint.h>
#include "test.h" #include "test.h"
extern void patch_addresses(uintptr_t* module); extern void patch_addresses(uintptr_t** module);
extern uintptr_t* bmodule_main; extern uintptr_t* bmodule_main[];
static void i_writehex(intptr_t code) static void i_writehex(intptr_t code)
{ {
@ -28,7 +28,7 @@ static uintptr_t* bmodule_test[] =
void binit(void) void binit(void)
{ {
patch_addresses(&bmodule_test); patch_addresses(bmodule_test);
patch_addresses(&bmodule_main); patch_addresses(bmodule_main);
} }