Browse Source

Remove unused files

Signed-off-by: Graham MacDonald <grahamamacdonald@gmail.com>
Graham MacDonald 5 years ago
parent
commit
d1b55ae08c

+ 0 - 2
sys/src/9/amd64/Linux

@@ -1,2 +0,0 @@
-Linux support was removed from this kernel.
-It may be found in /n/nixdump/2011/1114/sys/src/nix

+ 0 - 391
sys/src/9/amd64/acore.c.old

@@ -1,391 +0,0 @@
-#include "u.h"
-#include "../port/lib.h"
-#include "mem.h"
-#include "dat.h"
-#include "fns.h"
-
-#include <tos.h>
-#include <pool.h>
-#include "amd64.h"
-#include "ureg.h"
-#include "io.h"
-
-/*
- * BUG:
- * The AC must not accept interrupts while in the kernel,
- * or we must be prepared for nesting them, which we are not.
- * This is important for note handling, because postnote()
- * assumes that it's ok to send an IPI to an AC, no matter its
- * state.
- * 
- */
-
-void
-intrac(Proc *p)
-{
-	Mach *ac;
-
-	ac = p->ac;
-	if(ac == nil){
-		DBG("intrac: Proc.ac is nil. no ipi sent.\n");
-		return;
-	}
-	/*
-	 * It's ok if the AC gets idle in the mean time.
-	 */
-	DBG("intrac: ipi to cpu%d\n", ac->machno);
-	apicipi(ac->apicno);
-}
-
-/*
- * Functions starting with ac... are run in the application core.
- * All other functions are run by the time-sharing cores.
- */
-
-typedef void (*APfunc)(void);
-extern int notify(Ureg*);
-extern void _acsysret(void);
-extern void _actrapret(void);
-
-static char *acnames[] = { "Ok", "Trap", "Syscall"};
-
-void
-acmmuswitch(void)
-{
-	cr3put(machp()->pml4->pa);
-}
-void xactouser(u64int);
-void
-actouser(void)
-{
-	uintptr sp;
-	Ureg *u;
-
-	memmove(&sp, m->icc->data, sizeof(sp));
-	u = m->proc->dbgreg;
-	DBG("cpu%d: touser usp = %#p entry %#p\n", machp()->machno, sp, u->ip);
-
-
-	/*
-	 * This code for updating tos is wrong. It shouldn't go here.
-	 * It's the fact that we assing a process to a core what makes
-	 * it run in that core, not the fact that we call actouser(),
-	 * In the future, we might not even call actouser here. -Nemo.
-	 */
-
-	/* BUG: add a function, called here and kexit */
-	m->load = 100;
-	xactouser(sp);
-	panic("actouser");
-}
-
-void
-actrapret(void)
-{
-	/* done by actrap() */
-}
-
-/*
- * Entered in AP core context, upon traps and system calls.
- * using up->dbgreg means cores MUST be homogeneous.
- */
-void
-actrap(Ureg *u)
-{
-	/* print instead of DBG, so we see any trap by now */
-	switch(u->type){
-	case IdtIPI:
-		m->intr++;
-		print("actrap: cpu%d: IPI\n", machp()->machno);
-		/*
-		 * Beware: BUG: we can get now IPIs while in kernel mode,
-		 * after declaring the end of the interrupt.
-		 * The code is not prepared for that.
-		 */
-		apiceoi(IdtIPI);
-		break;
-	case IdtPF:
-		m->pfault++;
-		print("actrap: cpu%d: PF\n", machp()->machno);
-		break;
-	default:
-		print("actrap: cpu%d: %llu\n", machp()->machno, u->type);
-	}
-	m->icc->rc = ICCTRAP;
-	m->cr2 = cr2get();
-	memmove(m->proc->dbgreg, u, sizeof *u);
-	m->icc->fn = nil;
-	mfence();
-	ready(m->proc);
-	m->load = 0;
-	while(*m->icc->fn == nil)
-		;
-	m->load = 100;
-	if(m->icc->flushtlb)
-		acmmuswitch();
-	DBG("actrap: ret\n");
-	if(m->icc->fn != actrapret)
-		acsched();
-	memmove(u, m->proc->dbgreg, sizeof *u);
-}
-
-void
-acsyscall(void)
-{
-	/*
-	 * If we saved the Ureg into m->proc->dbgregs,
-	 * There's nothing else we have to do.
-	 * Otherwise, we should m->proc->dbgregs = u;
-	 */
-	DBG("acsyscall: cpu%d\n", machp()->machno);
-	m->syscall++;	/* would also count it in the TS core */
-	m->icc->rc = ICCSYSCALL;
-	m->cr2 = cr2get();
-	m->icc->fn = nil;
-	ready(m->proc);
-	m->load = 0;
-	/*
-	 * The next call is probably going to make us jmp
-	 * into user code, forgetting all our state in this
-	 * stack, upon the next syscall.
-	 * We don't nest calls in the current stack for too long.
-	 */
-	acsched();
-}
-
-/*
- * Called in AP core context, to return from system call.
- */
-void
-acsysret(void)
-{
-	DBG("acsysret\n");
-	_acsysret();
-}
-
-void
-dumpreg(void *u)
-{
-	print("reg is %p\n", u);
-	ndnr();
-}
-
-
-/*
- * run an arbitrary function with arbitrary args on an ap core
- * first argument is always pml4 for process
- * make a field and a struct for the args cache line.
- *
- * Returns the return-code for the ICC or -1 if the process was
- * interrupted while issuing the ICC.
- */
-int
-runac(int core, APfunc func, int flushtlb, void *a, long n)
-{
-	Mach *mp;
-	uchar *dpg, *spg;
-
-	if (n > sizeof(mp->icc->data))
-		panic("runac: args too long");
-
-	if((mp = sys->machptr[core]) == nil || mp->online == 0)
-		panic("Bad core");
-	if(mp->proc != nil && mp->proc != up)
-		panic("runapfunc: mach is busy with another proc?");
-
-	memmove(mp->icc->data, a, n);
-	if(flushtlb){
-		dpg = UINT2PTR(mp->pml4->va);
-		spg = UINT2PTR(machp()->pml4->va);
-		/* We should copy only user space mappings:
-		 *	memmove(dgp, spg, machp()->pml4->daddr * sizeof(PTE));
-		 */
-		memmove(dpg, spg, PTPGSZ);
-	}
-	mp->icc->flushtlb = flushtlb;
-	mp->icc->rc = ICCOK;
-
-	DBG("runac: exotic proc on cpu%d\n", mp->machno);
-	if(waserror()){
-		qunlock(&up->debug);
-		nexterror();
-	}
-	qlock(&up->debug);
-	up->ac = mp;
-	up->nicc++;
-	up->state = Exotic;
-	up->psstate = 0;
-	qunlock(&up->debug);
-	poperror();
-	mfence();
-	mp->icc->fn = func;
-	sched();
-	return mp->icc->rc;
-}
-
-/*
- * Cleanup done by runacore to pretend we are going back to user space.
- * We won't return and won't do what syscall() would normally do.
- * Do it here instead.
- */
-static void
-fakeretfromsyscall(Ureg *ureg)
-{
-	int s;
-
-	poperror();	/* as syscall() would do if we would return */
-	if(up->procctl == Proc_tracesyscall){	/* Would this work? */
-		up->procctl = Proc_stopme;
-		s = splhi();
-		procctl(up);
-		splx(s);
-	}
-
-	up->insyscall = 0;
-	/* if we delayed sched because we held a lock, sched now */
-	if(up->delaysched){
-		sched();
-		splhi();
-	}
-	kexit(ureg);
-}
-
-static void
-testproc(void *a)
-{
-	Proc *p;
-
-	p = a;
-	if(p == nil){
-		print("no proc to intr\n");
-		return;
-	}
-	tsleep(&up->sleep, return0, 0, 10000);
-	print("testproc: sending ipi to proc\n");
-	intrac(p);
-	print("sent\n");
-}
-
-/*
- * Move the current process to an application core.
- * This is performed at the end of execac(), and
- * we pretend to be returning to user-space, but instead we
- * dispatch the process to another core.
- * 1. We do the final bookkeeping that syscall() would do after
- *    a return from sysexec(), because we are not returning.
- * 2. We dispatch the process to an AC using an ICC.
- *
- * This function won't return unless the process is reclaimed back
- * to the time-sharing core, and is the handler for the process
- * to deal with traps and system calls until the process dies.
- *
- * Remember that this function is the "line" between user and kernel
- * space, it's not expected to raise|handle any error.
- *
- * We install a safety error label, just in case we raise errors,
- * which we shouldn't. (noerrorsleft knows that for exotic processes
- * there is an error label pushed by us).
- */
-void
-runacore(int core, u64int ar0p)
-{
-	Ureg *ureg;
-	void (*fn)(void);
-	int rc, flush, becometimesharing;
-
-	if(waserror())
-		panic("runacore: error: %s\n", up->errstr);
-	ureg = up->dbgreg;
-	ureg->ax = ar0p;		/* see xactouser */
-	fakeretfromsyscall(ureg);
-
-/* IPI testing */
-if(0)
-kproc("testproc", testproc, up);
-
-	rc = runac(core, actouser, 1, &ureg->sp, sizeof ureg->sp);
-	becometimesharing = 0;
-	for(;;){
-		flush = 0;
-		fn = nil;
-		switch(rc){
-		case ICCTRAP:
-			m->cr2 = up->ac->cr2;
-			DBG("runacore: trap %llu cr2 %#llx ureg %#p\n",
-				ureg->type, m->cr2, ureg);
-			if(ureg->type == IdtIPI){
-				if(up->procctl || up->nnote)
-					notify(up->dbgreg);
-				kexit(up->dbgreg);
-			}else
-				trap(ureg);
-			flush = 1;
-			fn = actrapret;
-			break;
-		case ICCSYSCALL:
-			DBG("runacore: syscall ax %#llx ureg %#p\n",
-				ureg->ax, ureg);
-			syscall(ureg->ax, ureg);
-			flush = 1;
-			fn = acsysret;
-			break;
-		default:
-			panic("runacore: unexpected rc = %d", rc);
-		}
-		if(becometimesharing)
-			break;
-		rc = runac(core, fn, flush, &ureg, sizeof ureg);
-	}
-
-	fakeretfromsyscall(up->dbgreg);
-	/*
-	 * dettach from the AC.
-	 */
-	up->ac->proc = nil;
-	up->ac = nil;
-	/* And we return to syscall, which would do nothing but
-	 * returning, and we'd be back to the TS core.
-	 */
-}
-
-void
-acmodeset(int mode)
-{
-	switch(mode){
-	case NIXAC:
-	case NIXKC:
-	case NIXTC:
-		break;
-	default:
-		panic("apmodeset: bad mode %d", mode);
-	}
-	m->nixtype = mode;
-}
-
-void
-stopac(Proc *p)
-{
-	Mach *mp;
-
-	mp = p->ac;
-	if(mp == nil)
-		return;
-	if(mp->proc != p)
-		return;
-	DBG("stopac: cpu%d\n", mp->machno);
-	p->ac = nil;
-	mp->proc = nil;
-//	send sipi to p->ac, it would rerun squidboy(), and
-//	wait for us to give it a function to run.
-}
-
-void
-acinit(void)
-{
-	/*
-	 * Lower the priority of the apic to 0,
-	 * to accept interrupts.
-	 * Raise it later if needed to disable them.
-	 */
-	apicpri(0);
-}

+ 0 - 123
sys/src/9/amd64/amd64coreboot.json

@@ -1,123 +0,0 @@
-[
-	{
-		"Name": "amd64cpu",
-		"Env": [
-			"CONF=amd64cpu"
-		],
-		"Include": [
-			"core.json",
-			"../386/386.json",
-			"../ip/ip.json",
-			"../port/port.json"
-		],
-		"Kernel": {
-			"Config": {
-				"Code": [
-					"int cpuserver = 1;",
-					"uint32_t kerndate = 1;"
-				],
-				"Dev": [
-					"acpi",
-					"arch",
-					"cap",
-					"cons",
-					"coreboot",
-					"draw",
-					"dup",
-					"env",
-					"fdmux",
-					"ether",
-					"iig",
-					"ip",
-					"kprof",
-					"mnt",
-					"mouse",
-					"pci",
-					"pipe",
-					"pmc",
-					"proc",
-					"ram",
-					"regress",
-					"root",
-					"rtc",
-					"sd",
-					"segment",
-					"srv",
-					"ssl",
-					"tls",
-					"uart",
-					"ws",
-					"usb",
-					"zp"
-				],
-				"Ip": [
-					"tcp",
-					"udp",
-					"ipifc",
-					"icmp",
-					"icmp6",
-					"gre"
-				],
-				"Link": [
-					"ether8169",
-					"ether82557",
-					"ether82563",
-					"etherigbe",
-					"ether8139",
-					"ethermedium",
-					"loopbackmedium",
-					"netdevmedium",
-					"usbuhci",
-					"usbohci",
-					"usbehci"
-				],
-				"Sd": [
-					"sdiahci"
-				],
-				"Uart": [
-					"i8250",
-					"pci"
-				],
-				"VGA": []
-			},
-			"Ramfiles": {
-				"bind": "/$ARCH/bin/bind",
-				"boot": "/sys/src/9/boot/bootamd64cpu.elf.out",
-				"cat": "/$ARCH/bin/cat",
-				"date": "/$ARCH/bin/date",
-				"echo": "/$ARCH/bin/echo",
-				"factotum": "/$ARCH/bin/auth/factotum",
-				"fdisk": "/$ARCH/bin/disk/fdisk",
-				"fossil": "/$ARCH/bin/fossil/fossil",
-				"ipconfig": "/$ARCH/bin/ip/ipconfig",
-				"ls": "/$ARCH/bin/ls",
-				"mount": "/$ARCH/bin/mount",
-				"nvram": "/util/nvram",
-				"prep": "/$ARCH/bin/disk/prep",
-				"rc": "/$ARCH/bin/rc",
-				"rcmain": "/rc/lib/rcmain",
-				"srv": "/$ARCH/bin/srv",
-				"startdisk": "startdisk",
-				"usbd": "/$ARCH/bin/usb/usbd",
-				"venti": "/$ARCH/bin/venti/venti"
-			},
-			"Systab": "/sys/src/libc/9syscall/sys.h"
-		},
-		"Program": "harvey",
-		"SourceFiles": [
-			"cga.c",
-			"devacpi.c",
-			"deviig.c",
-			"devusb.c",
-			"ether8139.c",
-			"ether82563.c",
-			"amd64cpu.c",
-			"mouse.c",
-			"cbscreen.c",
-			"usbehcipc.c",
-			"usbohci.c",
-			"usbuhci.c",
-			"cbvga.c"
-		]
-	}
-]

+ 0 - 256
sys/src/9/amd64/k8cpu

@@ -1,256 +0,0 @@
-dev +dev
-	root
-	cons
-	arch
-	env
-	pipe
-	proc
-	mnt
-	srv
-	dup
-	rtc
-#	ssl
-#	cap
-	kprof
-	pmc	pmcio
-	segment
-	acpi
-	zp
-	ws
-
-	cec
-
-	sd
-
-	ether	netif
-	ip		arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium ptclbsum inferno
-
-#	draw	screen vga vgax
-#	mouse	mouse
-#	vgax
-
-	pci
-
-	uart
-#	usb
-
-uart +dev
-	uarti8250
-	uartpci		pci
-
-ip +dev
-	tcp
-	udp
-	ipifc
-	icmp
-	icmp6
-	gre
-#	ipmux
-#	esp
-#	rudp
-
-link +dev
-	ether8169	pci ethermii
-	ether82557	pci
-	ether82563	pci
-	etherigbe	pci ethermii
-##	etherbcm	pci ethermii
-	ether8139	pci ethermii
-	ethermedium
-	loopbackmedium
-#	usbuhci
-#	usbohci
-#	usbehci	 usbehcipc
-	netdevmedium
-
-#	ht
-
-sd +dev
-	sdiahci		pci sdscsi
-
-misc +dev
-#	cache
-	mp		apic ioapic msi pci sipi
-	vga3dfx	+cur
-	vgaark2000pv	+cur
-	vgabt485	=cur
-	vgaclgd542x	+cur
-	vgaclgd546x	+cur
-	vgact65545	+cur
-	vgacyber938x	+cur
-	vgaet4000	+cur
-	vgahiqvideo	+cur
-	vgai81x	+cur
-	vgamach64xx	+cur
-	vgamga2164w	+cur
-	vgamga4xx	+cur
-	vganeomagic	+cur
-	vganvidia	+cur
-	vgargb524	=cur
-	vgas3	+cur vgasavage
-	vgat2r4	+cur
-	vgatvp3020	=cur
-	vgatvp3026	=cur
-	vgavesa
-	vgavmware	+cur
-
-#
-#boot cpu
-#	int cpuflag = 1;
-#boot cpu boot $3
-#	int cpuflag = 1;
-#	char* bootdisk = "$3";
-#boot rootdir $3
-#	char* rootdir = "$3";
-#boot (bboot|romboot|dosboot)
-#	int cpuflag = 1;
-#	char* bootprog = $2;
-#boot boot $3
-#	char* bootdisk = "$3";
-#
-boot cpu
-	tcp
-
-rootdir
-	boot.fs	boot
-#	bootk8cpu.out boot
-#	/amd64/bin/auth/factotum factotum
-#	/amd64/bin/ip/ipconfig ipconfig
-	/amd64/bin/ipconfig
-#	/amd64/bin/ping
-	/amd64/bin/srv
-#	/amd64/bin/usb/usbd
-	/amd64/bin/rc
-	/rc/lib/rcmain
-	/amd64/bin/bind
-	/amd64/bin/mount
-	/amd64/bin/echo
-	/amd64/bin/cat
-	/amd64/bin/aux/listen1
-	/amd64/bin/aux/tty
-	/amd64/bin/ls
-#	/amd64/bin/cp
-#	/amd64/bin/ps
-#	/amd64/bin/mkdir
-#	/amd64/bin/pwd
-	/amd64/bin/date
-#	../root/nvram nvram
-
-conf
-	int cpuserver = 1;
-
-#
-#dbgflg
-#	chan		'c'
-#	apic		'A'
-#	hpet		'H'
-#	ht		'H'
-#	ioapic		'I'
-#	mp		'M'
-#	pci		'P'
-#	arch		'V'
-#
-dbgflg
-	acore		'c'
-	apic		'A'
-	arch		'V'
-	asm		'm'
-	devacpi		'C'
-	devsegment	'z'
-	devzp		'z'
-	hpet		'H'
-	ht		'H'
-	image		'p'
-	ioapic		'I'
-	main		'x'
-	memory		'm'
-	mp		'M'
-	page		'p'
-	pager		'p'
-	physalloc		'm'
-	sysproc		'E'
-	sysseg		'p'
-	syssem		'S'
-	syszio		'z'
-	tcore		'c'
-	mmu		'v'
-
-amd64 +dev
-	l32p
-	l64v
-	l64idt
-	l64acidt
-	l64cpuid
-	l64syscall
-	l64acsyscall
-	l64fpu
-	acore
-	arch
-	archk10
-	asm
-	cga
-	crap
-	fpu
-	i8254
-	i8259
-	kbd
-	main
-	map
-	memory
-	mmu
-	multiboot
-	qmalloc
-	random
-	syscall
-	tcore
-	trap
-	vsvm
-	physalloc
-
-port
-	alarm
-	allocb
-	chan
-	dev
-	devtab
-	edf
-	fault
-	image
-	latin1
-	page
-	pager
-	parse
-	pgrp
-	portclock
-	print
-	proc
-	ps
-	qio
-	qlock
-	rebootcmd
-	segment
-	sysauth
-	sysfile
-	sysproc
-	sysseg
-	syssem
-	systab
-	taslock
-#	tcklock
-	tod
-	syszio
-	syscallfmt
-
-#
-#dir
-# pc		-.I.
-#
-dir
-	386
-	ip
-	port
-
-lib
-	libc
-	libip
-	libsec

+ 0 - 198
sys/src/9/amd64/k8cpufs

@@ -1,198 +0,0 @@
-dev +dev
-	root
-	cons
-	arch
-	env
-	pipe
-	proc
-	mnt
-	srv
-	dup
-	rtc
-	ssl
-	cap
-	kprof
-	pmc
-	segment
-
-	sd
-
-# add to get cec in the kernel
-#	cec
-
-	ether		netif
-	ip		arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium ptclbsum inferno
-
-	uart
-
-uart +dev
-	uarti8250
-	uartpci		pci
-pmc +dev
-	pmcio
-
-ip +dev
-	tcp
-	udp
-	ipifc
-	icmp
-	icmp6
-
-link +dev
-	ether8169	pci ethermii
-	ether82557	pci
-	ether82563	pci
-	etherigbe	pci ethermii
-	ethermedium
-	loopbackmedium
-	netdevmedium
-
-#	acpi		hpet
-#	ht
-
-sd +dev
-	sdiahci		pci sdscsi
-
-misc +dev
-	cache
-	mp		apic ioapic pci sipi
-
-#
-#boot cpu
-#	int cpuflag = 1;
-#boot cpu boot $3
-#	int cpuflag = 1;
-#	char* bootdisk = "$3";
-#boot rootdir $3
-#	char* rootdir = "$3";
-#boot (bboot|romboot|dosboot)
-#	int cpuflag = 1;
-#	char* bootprog = $2;
-#boot boot $3
-#	char* bootdisk = "$3";
-#
-boot cpu
-	tcp
-
-rootdir
-	boot.fs boot
-	/amd64/bin/rc rc
-	/rc/lib/rcmain
-	/amd64/bin/echo echo
-	/amd64/bin/date date
-	/amd64/bin/ls ls
-	/amd64/bin/ps ps
-	/amd64/bin/bind bind
-	/amd64/bin/cat cat
-	/amd64/bin/auth/factotum factotum
-	/amd64/bin/ip/ipconfig ipconfig
-	../root/big big
-	../root/nvram nvram
-
-conf
-	int cpuserver = 1;
-
-#
-#dbgflg
-#	chan		'c'
-#	apic		'A'
-#	acpi		'C'
-#	hpet		'H'
-#	ht		'H'
-#	ioapic		'I'
-#	mp		'M'
-#	pci		'P'
-#	arch		'V'
-#
-dbgflg
-	apic		'A'
-	acpi		'C'
-	hpet		'H'
-	ht		'H'
-	ioapic		'I'
-	mp		'M'
-	arch		'V'
-	sysproc		'E'
-	main		'x'
-	acore		'c'
-	tcore		'c'
-	syssem		'S'
-	page	'p'
-	pager	'p'
-	memory 'm'
-
-amd64 +dev
-	l32p
-	l64v
-	l64idt
-	l64acidt
-	l64syscall
-	l64acsyscall
-	l64fpu
-	cpuidamd64
-	acore
-	arch
-	archk10
-	cga
-	crap
-	fpu
-	i8254
-	i8259
-	kbd
-	main
-	map
-	memory
-	mmu
-	multiboot
-	random
-	syscall
-	tcore
-	trap
-	vsvm
-
-port
-	alarm
-	alloc		xalloc
-	allocb
-	chan
-	dev
-	devtab
-	edf
-	fault
-	image
-	latin1
-	page
-	parse
-	pgrp
-	portclock
-	print
-	proc
-	ps
-	qio
-	qlock
-	rebootcmd
-	segment
-	pager
-	sysauth
-	sysfile
-	sysproc
-	sysseg
-	systab
-	taslock
-	tod
-	syssem
-	syszio
-
-#
-#dir
-# pc		-.I.
-#
-dir
-	386
-	ip
-	port
-
-lib
-	libc
-	libip
-	libsec

+ 0 - 202
sys/src/9/amd64/k8cpukexec

@@ -1,202 +0,0 @@
-dev +dev
-	root
-	cons
-	arch
-	env
-	pipe
-	proc
-	kexec
-	cmd
-	mnt
-	srv
-	dup
-	rtc
-	ssl
-	cap
-	kprof
-#	pmc	pmcio
-	segment
-	acpi
-	tube
-	zp
-
-# add to get cec in the kernel
-#	cec
-
-	ether		netif
-	ip		arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium ptclbsum inferno
-
-	uart
-
-uart +dev
-	uarti8250
-	uartpci		pci
-
-ip +dev
-	tcp
-	udp
-	ipifc
-	icmp
-	icmp6
-
-link +dev
-	ether8169	pci ethermii
-	ether82557	pci
-	ether82563	pci
-	etherigbe	pci ethermii
-	ethermedium
-	loopbackmedium
-	netdevmedium
-
-#	ht
-
-misc +dev
-#	cache
-	mp		apic ioapic msi pci sipi
-#	rdb
-
-#
-#boot cpu
-#	int cpuflag = 1;
-#boot cpu boot $3
-#	int cpuflag = 1;
-#	char* bootdisk = "$3";
-#boot rootdir $3
-#	char* rootdir = "$3";
-#boot (bboot|romboot|dosboot)
-#	int cpuflag = 1;
-#	char* bootprog = $2;
-#boot boot $3
-#	char* bootdisk = "$3";
-#
-boot cpu
-	tcp
-
-rootdir
-	bootk8cpu.out boot
-	/amd64/bin/auth/factotum factotum
-	/amd64/bin/ip/ipconfig ipconfig
-	../root/nvram nvram
-
-conf
-	int cpuserver = 1;
-
-#
-#dbgflg
-#	chan		'c'
-#	apic		'A'
-#	hpet		'H'
-#	ht		'H'
-#	ioapic		'I'
-#	mp		'M'
-#	pci		'P'
-#	arch		'V'
-#
-dbgflg
-	acore		'c'
-	apic		'A'
-	arch		'V'
-	asm		'm'
-	devacpi		'C'
-	devsegment	'z'
-	devtube		'T'
-	devzp		'z'
-	hpet		'H'
-	ht		'H'
-	image		'p'
-	ioapic		'I'
-	kexec		'k'
-	main		'x'
-	memory		'm'
-	mp		'M'
-	nixcall		'n'
-	page		'p'
-	pager		'p'
-	physalloc		'm'
-	sysproc		'E'
-	sysseg		'p'
-	syssem		'S'
-	syszio		'z'
-	tcore		'c'
-	mmu		'v'
-
-amd64 +dev
-	l32p
-	l64v
-	l64idt
-	l64acidt
-	l64cpuid
-	l64syscall
-	l64acsyscall
-	l64fpu
-	acore
-	arch
-	archk10
-	asm
-	cga
-	crap
-	fpu
-	i8254
-	i8259
-	kbd
-	main
-	map
-	memory
-	mmu
-	multiboot
-	qmalloc
-	random
-	syscall
-	tcore
-	trap
-	vsvm
-	physalloc
-
-port
-	alarm
-	allocb
-	chan
-	dev
-	devtab
-	edf
-	fault
-	image
-	kexec
-	latin1
-	nixcall
-	page
-	pager
-	parse
-	pgrp
-	portclock
-	print
-	proc
-	ps
-	qio
-	qlock
-	rebootcmd
-	segment
-	sysauth
-	sysfile
-	sysproc
-	sysseg
-	syssem
-	systab
-	taslock
-	tod
-	syszio
-	syscallfmt
-
-#
-#dir
-# pc		-.I.
-#
-dir
-	386
-	ip
-	port
-
-lib
-	libc
-	libip
-	libsec

+ 0 - 5
sys/src/9/amd64/nixtype

@@ -1,5 +0,0 @@
-trap.c:261: 	tos->kcycles += t - up->kentry;
-trap.c:262: 	tos->pcycles = up->pcycles;
-trap.c:263: 	tos->pid = up->pid;
-trap.c:268: 	tos->core = mp->machno;	
-trap.c:269: 	tos->nixtype = mp->nixtype;

+ 0 - 29
sys/src/9/amd64/root/k8root.namespace

@@ -1,29 +0,0 @@
-# root
-mount -a $rootsrv /root $rootspec
-bind -a /root /
-bind -c /root/mnt /mnt
-
-# kernel devices
-bind #c /dev
-bind #d /fd
-bind -c #e /env
-bind #p /proc
-bind -c #s /srv
-
-# mount points
-
-# authentication
-mount -a /srv/factotum /mnt
-
-# standard bin
-bind /root/$cputype/bin /bin
-bind -a /root/rc/bin /bin
-
-# networks
-bind -a #I /net
-bind -a #l0 /net
-#mount -a /srv/cs /net
-#mount -a /srv/dns /net
-
-bind -c /usr/$user/tmp /tmp
-cd /usr/$user

+ 0 - 79
sys/src/9/amd64/root/k8root.proto

@@ -1,79 +0,0 @@
-adm d775 sys sys /tmp/empty
-	nvram 400 sys sys ./root/nvram
-	timezone d775 sys sys /tmp/empty
-lib d775 sys sys /tmp/empty
-	namespace 664 sys sys ./root/k8root.namespace
-	profile 664 sys sys ../root/profile
-mnt d775 sys sys /tmp/empty
-	cons d775 sys sys /tmp/empty
-		cons d775 sys sys /tmp/empty
-		consctl d775 sys sys /tmp/empty
-	exportfs d775 sys sys /tmp/empty
-		0 d775 sys sys /tmp/empty
-		1 d775 sys sys /tmp/empty
-		2 d775 sys sys /tmp/empty
-		3 d775 sys sys /tmp/empty
-		4 d775 sys sys /tmp/empty
-		5 d775 sys sys /tmp/empty
-		6 d775 sys sys /tmp/empty
-		7 d775 sys sys /tmp/empty
-		8 d775 sys sys /tmp/empty
-		9 d775 sys sys /tmp/empty
-		10 d775 sys sys /tmp/empty
-		11 d775 sys sys /tmp/empty
-		12 d775 sys sys /tmp/empty
-		13 d775 sys sys /tmp/empty
-		14 d775 sys sys /tmp/empty
-		15 d775 sys sys /tmp/empty
-		16 d775 sys sys /tmp/empty
-	keys d775 sys sys /tmp/empty
-	temp d775 sys sys /tmp/empty
-	term d775 sys sys /tmp/empty
-n d775 sys sys /tmp/empty
-	dump d775 sys sys /tmp/empty
-	fs d775 sys sys /tmp/empty
-	io d775 sys sys /tmp/empty
-	mnt d775 sys sys /tmp/empty
-rc d775 sys sys /tmp/empty
-	bin d775 sys sys /tmp/empty
-		service d775 sys sys /tmp/empty
-			tcp23 775 sys sys ../root/tcp23
-			tcp17007 775 sys sys /bin/service/tcp17007
-			tcp17010 775 sys sys ./root/tcp17010
-	lib d775 sys sys /tmp/empty
-		rcmain 775 sys sys
-tmp d775 sys sys /tmp/empty
-usr d775 sys sys /tmp/empty
-	glenda d775 sys sys /tmp/empty
-		lib d775 sys sys /tmp/empty
-			profile 664 sys sys ../root/profile
-
-amd64 d775 sys sys /tmp/empty
-	bin d775 sys sys /tmp/empty
-		# used by k8cpu.rc to get off the ground
-		bind 775 sys sys
-		echo 775 sys sys
-		rc 775 sys sys
-		sed 775 sys sys
-		srv 775 sys sys
-		telnet 775 sys sys
-		test 775 sys sys
-
-		# used to provide standalone service
-		auth d775 sys sys /tmp/empty
-			factotum 775 sys sys
-		aux d775 sys sys /tmp/empty
-			listen 775 sys sys
-		ip d775 sys sys /tmp/empty
-			telnetd 775 sys sys
-		ndb d775 sys sys /tmp/empty
-			cs 775 sys sys
-
-		cpu 775 sys sys ./root/6.cpu
-		exportfs 775 sys sys
-
-		# used for debugging
-
-	include d775 sys sys /tmp/empty
-	lib d775 sys sys /tmp/empty
-	mkfile 775 sys sys

+ 0 - 114
sys/src/9/amd64/root/k8root.rc

@@ -1,114 +0,0 @@
-#!/boot/rc -m /boot/rcmain
-flag x +
-
-cputype=amd64
-objtype=$cputype
-service=cpu
-authid=bootes
-rootdir=/root
-rootspec=''
-rootsrv=boot
-
-beetroot=k8root.rr
-authentication='nvram=/boot/adm/nvram auth/factotum -sfactotum -S'	# -a ...
-# test xyzip=(0 0 0 104.9.33)
-# test fsaddr='tcp!135.$xyzip(4)^!564'
-ip=(135.104.9.32 255.255.255.0 135.104.9.0 135.104.9.1)
-
-#
-# Post the read-only filesystem in #s/$beetroot
-# and mount it on /boot so the commands in /boot/$cputype/bin
-# are available to create the namespace (namespaces like to
-# mount #s/boot on / and that should not be the read-only
-# filesystem).
-# Must set hostowner to be that of the owner of the nvram file
-# before paqfs starts otherwise factotum will not be able to
-# open it.
-#
-/boot/echo -n sys > '#c/hostowner'
-/boot/paqfs -p -S $beetroot -m /boot -q /boot/$beetroot
-cd /boot/$cputype/bin
-bind '#c' /dev
-bind '#d' /fd
-bind -c '#e' /env
-bind '#p' /proc
-bind -c '#s' /srv
-
-#
-# Configure the networks.
-#
-bind -a '#I' /net
-bind -a '#l0' /net
-
-if(~ $#ip 4 && ! ~ $ip(1) '10.-1.-1.-1'){
-	i=`{sed '' /net/ipifc/clone}
-	echo bind ether /net/ether0 > /net/ipifc/$i/ctl
-	echo add $ip(1) $ip(2) $ip(3) > /net/ipifc/$i/ctl
-	echo add 0 0 $ip(4) >>/net/iproute
-	echo I am $ip(1)^, default route $ip(4)
-}
-i=`{sed '' /net/ipifc/clone}
-echo bind loopback /dev/null > /net/ipifc/$i/ctl
-echo add 127.0.0.1 255.0.0.0 127.0.0.0 > /net/ipifc/$i/ctl
-
-#
-# Set up authentication if necessary.
-# Factotum has to be allowed to mount on /mnt here because
-# auth_proxy (called by mount) will look for it there.
-# Normally, factotum will set '#c/hostowner'; if not, do it
-# by hand.
-#
-if(! ~ $authentication '')
-	eval `{echo $authentication}
-if(~ `{sed '' '#c/hostowner'} sys)
-	echo -n $authid > '#c/hostowner'
-
-#
-# Attach to the remote filesystem and mount it.
-# If this fails, set $root(dir|srv) and continue,
-# there's enough in the read-only filesystem to run
-# listen and telnet; at least cat /dev/kmesg might
-# then give a clue as to the problem.
-# Must check for the presence of expected files after
-# the mount because srv/mount do not always return
-# proper status.
-# $rootsrv is used in /lib/namespace because the
-# root might not be served from the usual #s/boot.
-#
-if(! ~ $fsaddr '' && ! eval srv -c -m $fsaddr $rootsrv $rootdir)
-	echo srv -c -m $fsaddr $rootsrv $rootdir fails: $status
-if(! test -d $rootdir/$cputype){
-	rootdir=/boot
-	rootspec=''
-	rootsrv=$beetroot
-}
-rootsrv='#s/'$rootsrv
-echo root is on $rootdir, root is served from $rootsrv
-
-#
-# Finish the namespace setup.
-#
-bind -a $rootdir /
-bind -c -b $rootdir/mnt /mnt
-bind $rootdir/$cputype/bin /bin
-bind -a $rootdir/rc/bin /bin
-cd /
-
-#
-# Finish environment setup and start services.
-# Listen is run trusted if there is no factotum running,
-# as 'cpu -R' with no authentication needs to be able to
-# open '#¤/caphash' in order to change the owner and
-# that can only be done if running as '#c/hostowner'.
-#
-sysname=cpu-$ip(1)
-prompt=($sysname'# ' '	') 
-bind /boot/rc/bin/service /bin/service
-if(test -d /mnt/factotum)
-	aux/listen -q tcp
-if not
-	aux/listen -t /bin/service tcp
-
-flag x -
-while(echo Hello Squidboy)
-	. -i '#d/0'

+ 0 - 12
sys/src/9/amd64/root/mkfile

@@ -1,12 +0,0 @@
-MKSHELL=$PLAN9/bin/rc
-objtype=amd64
-</$objtype/mkfile
-
-TARG=`{ls *.[cy] | sed '/\.tab\.c$/d;s/..$//'}
-HFILES=/$objtype/include/u.h /sys/include/libc.h
-BIN=$home/bin/$objtype
-PROGS=${TARG:%=$O.%}
-LDFLAGS=
-YFLAGS=-d
-
-</sys/src/cmd/mkmany