Load modules and resolve functions in crt0

examples/camera/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/camera/source/main.c

@@ -30,14 +30,6 @@
 	} while(0)
 
 int _main(void) {
-	// Init and resolve libraries
-	initKernel();
-
-	initLibc();
-	initNetwork();
-	initCamera();
-
-
 	// Connect to server and send message
 	char socketName[] = "debug";
 

examples/canvas/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/canvas/source/main.c

@@ -55,12 +55,6 @@ void *canvasRenderer(void *arg) {
 }
 
 int _main(void) {
-	// Init and resolve libraries
-	initKernel();
-
-	initPthread();
-
-
 	// Create our canvas rendering thread
 	ScePthread thread;
 	scePthreadCreate(&thread, NULL, canvasRenderer, NULL, "canvasRenderer");

examples/filesystem/directories/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/filesystem/directories/source/main.c

@@ -16,13 +16,6 @@ char *entryName(int entryType) {
 }
 
 int _main(void) {
-	// Init and resolve libraries
-	initKernel();
-
-	initLibc();
-	initNetwork();
-
-
 	// Connect to server
 	char socketName[] = "debug";
 

examples/filesystem/files/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/filesystem/files/source/main.c

@@ -8,13 +8,6 @@
 	} while(0)
 
 int _main(void) {
-	// Init and resolve libraries
-	initKernel();
-
-	initLibc();
-	initNetwork();
-
-
 	// Connect to server
 	char socketName[] = "debug";
 

examples/hello/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/hello/source/main.c

@@ -1,12 +1,6 @@
 #include "ps4.h"
 
 int _main(void) {
-	// Init and resolve libraries
-	initKernel();
-
-	initLibc();
-
-
 	// Use getpid system call
 	int pid = syscall(20);
 

examples/modules/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/modules/source/main.c

@@ -1,13 +1,6 @@
 #include "ps4.h"
 
 int _main(void) {
-	// Init and resolve libraries
-	initKernel();
-
-	initLibc();
-	initNetwork();
-
-
 	// Connect to debug server
 	char socketName[] = "debug";
 

examples/pad/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/pad/source/main.c

@@ -12,22 +12,7 @@
 unsigned char data[512];
 
 int _main(void) {
-	// Init and resolve libraries
-	initKernel();
-
-	initLibc();
-	initNetwork();
-
-
-	// Get id of already loaded pad module
-	int padModule;
-	loadModule("libScePad.sprx", &padModule);
-
-	// Unload it
-	unloadModule(padModule);
-
-	// Start fresh
-	initPad();
+	scePadInit();
 
 
 	// Connect to debug server

examples/sockets/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/sockets/source/main.c

@@ -8,13 +8,6 @@
 	} while(0)
 
 int _main(void) {
-	// Init and resolve libraries
-	initKernel();
-
-	initLibc();
-	initNetwork();
-
-
 	// Connect to server and send message
 	char socketName[] = "debug";
 

examples/threads/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/threads/source/main.c

@@ -9,12 +9,6 @@ void *thread_func(void *arg) {
 }
 
 int _main(void) {
-	// Init and resolve libraries
-	initKernel();
-
-	initLibc();
-	initPthread();
-
 	int foo = 0;
 
 	ScePthread thread;

examples/usb/list_devices/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/usb/list_devices/source/main.c

@@ -42,13 +42,6 @@ Device 0
 	} while(0)
 
 int _main(void) {
-	// Load modules
-	initKernel();
-
-	initLibc();
-	initNetwork();
-	initUsb();
-
 	// Init netdebug
 	struct sockaddr_in server;
 	server.sin_len = sizeof(server);

examples/usb/storage/Makefile

@@ -22,7 +22,7 @@ LIBS	:=	-lPS4
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/usb/storage/source/main.c

@@ -326,13 +326,6 @@ static int test_mass_storage(libusb_device_handle *handle, uint8_t endpoint_in,
 }
 
 int _main(void) {
-	// Load modules
-	initKernel();
-
-	initLibc();
-	initNetwork();
-	initUsb();
-
 	// Init netdebug
 	struct sockaddr_in server;
 	server.sin_len = sizeof(server);

examples/usb/usbfatfs/Makefile

@@ -23,7 +23,7 @@ LIBS	:=	-lPS4 -lusbfatfs
 TARGET = $(shell basename $(CURDIR)).bin
 
 $(TARGET): $(ODIR) $(OBJS)
-	$(CC) $(LIBPS4)/crt0.s $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
+	$(CC) $(LIBPS4)/crt0.c $(ODIR)/*.o -o temp.t $(CFLAGS) $(LFLAGS) $(LIBS)
 	$(OBJCOPY) -O binary temp.t $(TARGET)
 	rm -f temp.t
 

examples/usb/usbfatfs/source/main.c

@@ -22,11 +22,6 @@ int _netdebug_sock;
 
 int _main(void)
 {
-	// Init and resolve libraries
-	initKernel();
-	initLibc();
-	initNetwork();
-
 	struct sockaddr_in server;
 
 	server.sin_len = sizeof(server);

libPS4/Makefile

@@ -9,17 +9,26 @@ LDIR	:=	lib
 CFLAGS	:=	-I$(IDIR) -O2 -std=c11 -fno-builtin -nostartfiles -nostdlib -Wall -masm=intel -march=btver2 -mtune=btver2 -m64 -mabi=sysv -mcmodel=large
 SFLAGS	:=	-nostartfiles -nostdlib -march=btver2 -mtune=btver2
 CFILES	:=	$(wildcard $(SDIR)/*.c)
+CPPASFILES	:= $(wildcard $(SDIR)/*.S)
 SFILES	:=	$(wildcard $(SDIR)/*.s)
-OBJS	:= $(patsubst $(SDIR)/%.c, build/%.o, $(CFILES)) $(patsubst $(SDIR)/%.s, build/%.o, $(SFILES))
+OBJS := $(patsubst $(SDIR)/%.c, build/%.o, $(CFILES))	\
+	$(patsubst $(SDIR)/%.s, build/%.o, $(SFILES))
 
 TARGET = $(shell basename $(CURDIR)).a
 
+all: $(TARGET)
+
+include import.mk
+
 $(TARGET): $(ODIR) $(OBJS)
 	$(AR) rcs $@ $(OBJS)
 
 $(ODIR)/%.o: $(SDIR)/%.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 
+$(ODIR)/%.o: $(SDIR)/%.S
+	$(CC) -c -o $@ $< $(CFLAGS)
+
 $(ODIR)/%.o: $(SDIR)/%.s
 	$(AS) -c -o $@ $< $(SFLAGS)
 
@@ -29,4 +38,4 @@ $(ODIR):
 .PHONY: clean
 
 clean:
-	rm -f $(TARGET) $(ODIR)/*.o
+	rm -Rf $(TARGET) $(ODIR)/*

libPS4/crt0.c

@@ -0,0 +1,48 @@
+#include <module.h>
+
+union module {
+	const char *s;
+	int id;
+};
+
+extern union module __moduleTop[];
+extern union module __moduleBtm[];
+extern void *__stubTop[];
+extern void *__stubBtm[];
+
+extern union module __libkernel;
+int (* sceKernelLoadStartModule)(const char *name,
+	size_t argc, const void *argv, unsigned int flags, int, int);
+
+int _main(int argc, char *argv[]);
+
+static void loadModules()
+{
+	union module *p;
+	int id;
+
+	loadModule(__libkernel.s, &__libkernel.id);
+	getFunctionAddressByName(__libkernel.id,
+		"sceKernelLoadStartModule", sceKernelLoadStartModule);
+
+	for (p = __moduleTop; p != __moduleBtm; p++) {
+		loadModule(p->s, &id);
+		unloadModule(id);
+		p->id = sceKernelLoadStartModule(p->s, 0, NULL, 0, 0, 0);
+	}
+}
+
+static void resolveStubs()
+{
+	void **p;
+
+	for (p = __stubTop; p != __stubBtm; p += 2)
+		getFunctionAddressByName(*(int *)(p[0]), p[1], p);
+}
+
+int _start(int argc, char *argv[])
+{
+	loadModules();
+	resolveStubs();
+	return _main(argc, argv);
+}