@@ -346,11 +346,13 @@ archfmtinstall(void)
* on the compiler to optimise-away impossible conditions,
* and/or by exploiting the innards of the fmt library.
*/
-hi("archfmtinstall\n");
+ hi("fmtP");
fmtinstall('P', fmtP);
-
+ hi("fmtL");
fmtinstall('L', fmtL);
+ hi("fmtR");
fmtinstall('R', fmtR);
+ hi("fmtW");
fmtinstall('W', fmtW);
}
@@ -62,12 +62,14 @@ fmtstrinit:
#endif
.global fork
fork:
+#if 0
.global fprint
fprint:
.global getcallerpc
getcallerpc:
.global getfields
getfields:
+#endif
.global hmac_sha1
hmac_sha1:
.global hnputl
@@ -124,20 +126,23 @@ sdfakescsi:
sdsetsense:
.global sendp
sendp:
-.global seprint
-seprint:
.global sipi
sipi:
+.global seprint
+seprint:
.global smprint
smprint:
.global snprint
snprint:
.global sprint
sprint:
.global ssldevtab
ssldevtab:
.global statcheck
statcheck:
.global strchr
strchr:
.global strcmp
@@ -164,6 +169,7 @@ strtol:
strtoul:
.global strtoull
strtoull:
.global syscallentry
syscallentry:
.global sysrforkret
@@ -176,6 +182,7 @@ threadexitsall:
tokenize:
.global touser
touser:
.global utfnlen
utfnlen:
.global utfrune
@@ -184,6 +191,7 @@ utfrune:
vseprint:
.global vsnprint
vsnprint:
.global write
write:
.global xactouser
@@ -359,8 +359,9 @@ main(uint32_t ax, uint32_t bx)
wave('s');
fmtinit();
- die("we're back from fmtinit\n");
+
print("\nNIX\n");
+ die("we're back from fmtinit\n");
sys->nmach = 1;
if(vflag){
@@ -36,10 +36,6 @@ _efgfmt(Fmt* fmt)
void
fmtinit(void)
{
-hi("q");
-return;
quotefmtinstall();
-hi("u");
archfmtinstall();
-hi("arch\n");
@@ -275,7 +275,7 @@ unlock(Lock *l)
print("unlock: up changed: pc %#p, acquired at pc %#p, lock p %#p, unlock up %#p\n", getcallerpc(&l), l->_pc, l->p, up);
l->m = nil;
l->key = 0;
- coherence();
+ //coherence();
if(up && adec(&up->nlocks) == 0 && up->delaysched && islo()){
/*
@@ -315,7 +315,7 @@ iunlock(Lock *l)
pl = l->pl;
m->ilockdepth--;
if(up)
up->lastilock = nil;
@@ -1,3 +0,0 @@
-data2.c needs to be compiled with plan9port.
-It's a substitute to data2s needed to kernel compiling.