# HG changeset patch
# User Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
# Date 1565114490 14400
#      Tue Aug 06 14:01:30 2019 -0400
# Node ID 866e79cf580fcc1cdead498302010333dd6d1a3c
# Parent  43f435d0d45499596800caf9cd2ddebbe0f6d2b9
loader: use sastart

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

diff --git a/loader/loader/Makefile b/loader/loader/Makefile
--- a/loader/loader/Makefile
+++ b/loader/loader/Makefile
@@ -21,13 +21,14 @@
 #
 
 BIN=	loader
-SRCS=	setmode.s \
-	loader_c.c \
+SRCS=	loader_c.c \
 	loader_asm.s
 BITS=	64
 
 CFLAGS.OPT=	-Os
 
+LD_ADD=	$(SRCTOP)/sastart/sastart.a
+
 .include <${.CURDIR:H:H}/build.mk>
 
 all: loader.raw
diff --git a/loader/loader/linker.script b/loader/loader/linker.script
--- a/loader/loader/linker.script
+++ b/loader/loader/linker.script
@@ -22,7 +22,7 @@
 
 SECTIONS
 {
-  ENTRY(MAIN)
+  ENTRY(_start390)
   . = 0x800000;
   .text : {
   	*setmode.o(.text)
diff --git a/loader/loader/loader_c.c b/loader/loader/loader_c.c
--- a/loader/loader/loader_c.c
+++ b/loader/loader/loader_c.c
@@ -220,7 +220,7 @@
 		read_blk(TEMP_BASE + (4096 * i), ptrbuf[i]);
 }
 
-void load_nucleus(void)
+void start(void)
 {
 	/*
 	 * These are all stored in registers
diff --git a/loader/loader/setmode.s b/loader/loader/setmode.s
deleted file mode 100644
--- a/loader/loader/setmode.s
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2007-2009 Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-.globl MAIN
-	.type	MAIN, @function
-MAIN:
-#
-# At this point, the machine is running in ESA390 mode. Let's load a new
-# PSW, making it switch to 64-bit mode
-#
-
-	# switch to 64-bit mode
-	#
-	# Signal Processor
-	#   Order 0x12: Set Architecture
-	#   R1 bits 56-63 = 0x01 (switch all CPUs to z/Arch)
-	SR	%r1, %r1
-	LHI	%r1, 0x1	# switch all to z/Arch
-	SR	%r3, %r3	# CPU Address (CPU0000)
-	SIGP	%r1, %r3, 0x12	# Signal, order 0x12
-	SAM64
-	# On error:
-	#   Bit 55 = 1, cc1 (inval param)
-	#   Bit 54 = 1, cc1 (incorrect state)
-
-	# FIXME: check for errors?
-
-#
-# At this point, we should be in 64-bit mode
-#
-
-	#
-	# It is unfortunate that the below code is required.
-	#
-	# Let's set the stack pointer to make gcc happy
-	#
-	# A standard stack frame is 160 bytes.
-	#
-	# NOTE: Once this thread of execution turns into the idle thread,
-	# the stack can be reused for something else. Since it's allocated
-	# in the 128th processor's PSA, we have to make sure that it won't
-	# get initialized until after the idle thread kicks in.
-	#
-
-	# r15 = 0x100000
-	#     = (1 << 20)
-	#
-	SR	%r15, %r15
-	LHI	%r15, 0x1
-	SLL	%r15, 20
-	AHI	%r15, -160
-
-	BRC	15,load_nucleus