shithub: nix

Download patch

ref: 765ea1843f7c4668a185611ca928b0f805121b32
parent: 0538b85a46b6bfc88cd1fd22a96e46072befa57b
author: glenda <glenda@cirno>
date: Sat May 4 11:15:56 EDT 2024

Kernel now builds.

--- a/sys/src/nix/pc64/acore.c
+++ b/sys/src/nix/pc64/acore.c
@@ -137,7 +137,7 @@
 	void xactouser(u64int);
 	Ureg *u;
 
-	acfpusysprocsetup(m->proc);
+	print("fix me acfpusysprocsetup(m->proc);\n");
 
 	u = m->proc->dbgreg;
 	DBG("cpu%d: touser usp = %#p entry %#p\n", m->machno, u->sp, u->pc);
--- a/sys/src/nix/pc64/amd64l.h
+++ b/sys/src/nix/pc64/amd64l.h
@@ -157,6 +157,3 @@
 #define SiFS		6			/* FS selector index */
 #define SiGS		7			/* GS selector index */
 #define SiTSS		8			/* TSS selector index */
-
-#define RMACH		R15			/* m-> */
-#define RUSER		R14			/* up-> */
--- a/sys/src/nix/pc64/l64acsyscall.s
+++ b/sys/src/nix/pc64/l64acsyscall.s
@@ -14,7 +14,8 @@
 	/* save sp to r13; set up kstack so we can call acsyscall */
 	MOVQ	SP, R13
 	MOVQ	24(RMACH), SP			/* m->stack */
-	ADDQ	$MACHSTKSZ, SP
+	// FIX ME
+	ADDQ	4096/*$MACHSTKSZ*/, SP
 
 	MOVQ	$SSEL(SiUDS, SsRPL3), BX		/* old stack segment */
 	MOVQ	BX, 176(R12)				/* save ss */
--- a/sys/src/nix/pc64/nixmkfile
+++ b/sys/src/nix/pc64/nixmkfile
@@ -61,6 +61,8 @@
 	$DEVS\
 	$PORT\
 	acore.$O\
+	l64acidt.$O\
+	l64acsyscall.$O\
 
 LIB=\
 	/$objtype/lib/libmemlayer.a\