From d38419f494a9ebc700e77a67c82222f8c11459ec Mon Sep 17 00:00:00 2001 From: "saoret.one" Date: Mon, 15 Jun 2009 18:17:30 +0000 Subject: [PATCH] mkfiles: use only a.out objects (see ktload) --- arm7/mkfile | 7 ++----- devaudio.c | 6 +++--- guide | 6 +++--- mkfile | 22 ++++++++++------------ root/usr/inferno/keyring/default | 0 root/usr/inferno/lib/plumbing | 0 root/usr/inferno/namespace | 0 sds | 15 +++++++-------- 8 files changed, 25 insertions(+), 31 deletions(-) create mode 100644 root/usr/inferno/keyring/default create mode 100644 root/usr/inferno/lib/plumbing create mode 100644 root/usr/inferno/namespace diff --git a/arm7/mkfile b/arm7/mkfile index 539240f..c84360d 100644 --- a/arm7/mkfile +++ b/arm7/mkfile @@ -32,12 +32,9 @@ LIBS=\ CFLAGS=-wFV -I $ROOT/Inferno/arm/include -I $ROOT/include -r -default:V: i$CONF i$CONF.p9 +default:V: i$CONF i$CONF: $OFILES - $LD -o $target -H0 -R4 -T$KTZERO7 -l $OFILES $libs $SYSLIBS - -i$CONF.p9: $OFILES $LD -o $target -R4 -T$KTZERO7 -l $OFILES $libs $SYSLIBS trap.t: trap.5 @@ -50,6 +47,6 @@ syms: $OFILES vclean:V: clean rm -f syms - rm -f i$CONF i$CONF.p9 + rm -f i$CONF <$ROOT/mkfiles/mkone-$SHELLTYPE diff --git a/devaudio.c b/devaudio.c index ca0cff0..7214884 100644 --- a/devaudio.c +++ b/devaudio.c @@ -445,11 +445,11 @@ audiowrite(Chan *c, void *vp, long n, vlong) if(++i >= nf) error(Evolume); if(strcmp(field[i], "pcm") == 0) - audio.flags |= Apcm; + audio.flags |= AFlagpcm; else if(strcmp(field[i], "adpcm") == 0) - audio.flags |= Aadpcm; + audio.flags |= AFlagadpcm; else if(strcmp(field[i], "psg") == 0) - audio.flags |= Apsg; + audio.flags |= AFlagpsg; else error(Evolume); goto cont0; diff --git a/guide b/guide index 775e7f7..7a0a6c5 100644 --- a/guide +++ b/guide @@ -8,7 +8,7 @@ cp dsinit.b ../init i mk 'CONF=sds' vclean i mk 'CONF=sds' syms i mk 'CONF=sds' -i inm isds.p9 +i inm isds u mount /mnt/usb cp i*ds.nds /mnt/usb; sync @@ -17,8 +17,8 @@ u umount /mnt/usb desmume isds.nds wine $home/nogba-2.6a/'NO$GBA.EXE' isds.nds -echo 'dsmap9(); asm(main); // dump(ktzero, etext-ktzero, "i")' | i acid -l acidmap isds.p9 -echo 'dsmap7(); asm(main); // dump(ktzero, etext-ktzero, "i")' | i acid -l acidmap arm7/isds.p9 +echo 'dsmap9(); asm(main); // dump(ktzero, etext-ktzero, "i")' | i acid -l acidmap isds +echo 'dsmap7(); asm(main); // dump(ktzero, etext-ktzero, "i")' | i acid -l acidmap arm7/isds i emu disdep /os/init/dsinit.dis | sort |t+ diff --git a/mkfile b/mkfile index 4373b3b..7288880 100644 --- a/mkfile +++ b/mkfile @@ -15,8 +15,10 @@ INSTALLDIR=$ROOT/Inferno/$OBJTYPE/bin #path of directory where kernel is install <| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $ETHERS, $VGAS, $PORT, $MISC, $LIBS, $OTHERS -KTZERO=0x02000130 +KTZERO9=0x02000130 # 0x130 (Mach) +KTLOAD9=0x02000110 # -0x20 (size of a.out header) KTZERO7=0x03800000 +KTLOAD7=0x037fffe0 # -0x20 (size of a.out header) OBJ=\ l.$O\ @@ -52,15 +54,15 @@ HFILES=\ CFLAGS=-wFV -I$ROOT/Inferno/$OBJTYPE/include -I$ROOT/include -I$ROOT/libinterp -r KERNDATE=`{ndate} -default:V: i$CONF.nds i$CONF.p9 i$CONF.SYM # i$CONF.kfs +default:V: i$CONF.nds i$CONF.SYM # i$CONF.kfs -install:V: $INSTALLDIR/i$CONF $INSTALLDIR/i$CONF.gz $INSTALLDIR/i$CONF.p9.gz $INSTALLDIR/i$CONF.raw +install:V: $INSTALLDIR/i$CONF $INSTALLDIR/i$CONF.gz $INSTALLDIR/i$CONF.raw i$CONF: $OBJ $CONF.c $CONF.root.h $LIBNAMES $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c - $LD -o $target -H0 -T$KTZERO -l $OBJ $CONF.$O $LIBFILES + $LD -o $target -R4 -T$KTZERO9 -l $OBJ $CONF.$O $LIBFILES -arm7/i$CONF arm7/i$CONF.p9: $ARM7SRC +arm7/i$CONF: $ARM7SRC cd arm7; mk CONF'='$CONF # must be ARM code, even when OBJTYPE=thumb @@ -76,8 +78,8 @@ REV=`{svn info | sed -n 's/^Revisi.n: /rev./p'} i$CONF.nds: i$CONF arm7/i$CONF ndstool -g INFR -m ME -c i$CONF.nds -b ds.bmp \ 'Native Inferno Kernel NDS port;inferno-ds '$REV';code.google.com/p/inferno-ds' \ - -7 arm7/i$CONF -r7 $KTZERO7 -e7 $KTZERO7 \ - -9 i$CONF -r9 $KTZERO -e9 $KTZERO + -7 arm7/i$CONF -r7 $KTLOAD7 -e7 $KTZERO7 \ + -9 i$CONF -r9 $KTLOAD9 -e9 $KTZERO9 # append rom data at end of .nds (see root/dis/mkkfs) echo -n ROMZERO9 >> i$CONF.nds # dlditool misc/R4tf.dldi i$CONF.nds @@ -85,11 +87,7 @@ i$CONF.nds: i$CONF arm7/i$CONF i$CONF.ds.gba: i$CONF.nds dsbuild $prereq -o $target -i$CONF.p9: $OBJ $CONF.c $CONF.root.h $LIBNAMES - $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c - $LD -o $target -R4 -T$KTZERO -l $OBJ $CONF.$O $LIBFILES - -i$CONF.SYM: i$CONF.p9 arm7/i$CONF.p9 +i$CONF.SYM: i$CONF arm7/i$CONF $SHELLNAME mksymtab $prereq > $target <../port/portmkfile diff --git a/root/usr/inferno/keyring/default b/root/usr/inferno/keyring/default new file mode 100644 index 0000000..e69de29 diff --git a/root/usr/inferno/lib/plumbing b/root/usr/inferno/lib/plumbing new file mode 100644 index 0000000..e69de29 diff --git a/root/usr/inferno/namespace b/root/usr/inferno/namespace new file mode 100644 index 0000000..e69de29 diff --git a/sds b/sds index 0b8bd30..93e13e1 100644 --- a/sds +++ b/sds @@ -177,13 +177,13 @@ root # things that live in /n/local /usr/inferno - /usr/inferno/charon - /usr/inferno/keyring - /usr/inferno/lib - /usr/inferno/lib/plumbing - /usr/inferno/lib/profile - /usr/inferno/lib/wmsetup - /usr/inferno/namespace + /usr/inferno/namespace /os/ds/root/usr/inferno/namespace + /usr/inferno/keyring /os/ds/root/usr/inferno/keyring + /usr/inferno/lib /os/ds/root/usr/inferno/lib + /usr/inferno/lib/plumbing /os/ds/root/usr/inferno/lib/plumbing + /usr/inferno/lib/profile /os/ds/root/usr/inferno/lib/profile + /usr/inferno/lib/wmsetup /os/ds/root/usr/inferno/lib/wmsetup + /usr/inferno/lib/invhit.iaf /os/ds/root/usr/inferno/lib/invhit.iaf /fonts/lucidasans/lsr.10 /fonts/lucidasans/lsb.10 /fonts/lucidasans/unicode.6.font @@ -235,7 +235,6 @@ root /icons/tinytk/ok.bit /dis/auplay.dis - /usr/inferno/lib/invhit.iaf # /dis/lib/devpointer.dis # /dis/nds/touchprint.dis