Build no longer needs the bsd environment var & Debug Kernel launcher is implemented.

This commit is contained in:
Greg
2022-03-30 23:28:33 -06:00
parent 2c0d9dca52
commit dfc7040a74
18 changed files with 115 additions and 57 deletions
@@ -19,18 +19,12 @@
<file targ_path="sce_sys/pic0.png" orig_path="sce_sys\pic0.png" />
<file targ_path="sce_sys/pic1.png" orig_path="sce_sys\pic1.png" />
<file targ_path="eboot.bin" orig_path="eboot.bin" />
<file targ_path="Kernel/Kernel.505.ELF" orig_path="Kernel\Kernel.505.ELF" />
<file targ_path="Kernel/Kernel.672.ELF" orig_path="Kernel\Kernel.672.ELF" />
<file targ_path="Kernel/Kernel.702.ELF" orig_path="Kernel\Kernel.702.ELF" />
<file targ_path="Kernel/Kernel.755.ELF" orig_path="Kernel\Kernel.755.ELF" />
<file targ_path="Kernel/Kernel.900.ELF" orig_path="Kernel\Kernel.900.ELF" />
<file targ_path="sce_module/libc.prx" orig_path="sce_module\libc.prx" />
<file targ_path="sce_module/libjbc.sprx" orig_path="sce_module\libjbc.sprx" />
<file targ_path="sce_module/libSceFios2.prx" orig_path="sce_module\libSceFios2.prx" />
</files>
<rootdir>
<dir targ_name="sce_sys" />
<dir targ_name="Kernel" />
<dir targ_name="sce_module" />
</rootdir>
</psproject>
Binary file not shown.
Binary file not shown.
@@ -26,6 +26,7 @@ struct InstallArgs {
int install_orbis(struct thread* td, struct InstallArgs* args)
{
uint64_t kernbase = getkernbase();
auto Log = (void(*)(vm_map_t, vm_size_t))(kernbase + OffsetTable->kmem_alloc);
auto kmem_alloc = (vm_offset_t(*)(vm_map_t, vm_size_t))(kernbase + OffsetTable->kmem_alloc);
auto kernel_map = *(vm_map_t*)(kernbase + OffsetTable->kernel_map);
@@ -1,7 +1,70 @@
#include <stdio.h>
#include "Common.h"
#include "KernelLoader.h"
#include <sys/ioctl.h>
#include "../../../Misc/DriverDefinitions.h"
#include "OrbisDriver.h"
int main()
{
// Your code here...
return 0;
int SoftwareVersion = 0;
int Handle = 0;
// Load internal system modules.
if (!LoadModules())
{
Notify("Failed to Load Modules...");
sceSystemServiceLoadExec("exit", 0);
return 0;
}
// Break Free
if (!Jailbreak())
{
Notify("Jailbreak failed...");
sceSystemServiceLoadExec("exit", 0);
return 0;
}
// Get Firmware Version
SoftwareVersion = GetUpdateVersion();
// Set the Kernel Version.
SetKernelVersion(SoftwareVersion);
// Init Kernel driver if not present.
if (!OrbisDriver::TestDriver())
{
klog("[Orbis Suite] Launching Kernel!!\n");
char KernelPath[0x100];
sprintf(KernelPath, "/data/Orbis Suite/Kernel.%03X.ELF", (SoftwareVersion >> 16));
if (!LoadKernel(KernelPath, SoftwareVersion))
{
Notify("Failed to load Kernel ELF...");
klog("Failed to load Kernel ELF...\n");
}
else
{
Notify("Loaded Kernel ELF Successfully!");
klog("Loaded Kernel ELF Successfully!\n");
}
}
else
{
if (!UnloadKernel())
{
Notify("Failed to stop Kernel ELF...");
klog("Failed to stop Kernel ELF...\n");
}
else
{
Notify("Un-Loaded Kernel ELF Successfully!");
klog("Un-Loaded Kernel ELF Successfully!\n");
}
}
while (true) sceKernelSleep(1);
sceSystemServiceLoadExec("exit", 0);
return 0;
}
+1 -1
View File
@@ -1 +1 @@
call "C:\Users\grego\source\repos\Orbis-Suite-2.0\Misc\Increment.bat" "C:\Users\grego\source\repos\Orbis-Suite-2.0\Playstation\Kernel\Kernel\source\Util\Settings.hpp" "KDRIVER_BUILD_VERSION"
call "E:\Greg\Repos\Orbis-Suite-3.0\Misc\Increment.bat" "E:\Greg\Repos\Orbis-Suite-3.0\Playstation\Kernel\Kernel\source\Util\Settings.hpp" "KDRIVER_BUILD_VERSION"
Binary file not shown.
+1 -1
View File
@@ -4,7 +4,7 @@ OBJCOPY := objcopy
ODIR := build
SDIR := source
RDIR := Resources
IDIRS := -Iinclude -I$(FREEBSD_INCLUDES) -I../../../Misc
IDIRS := -Iinclude -I../../../External/FreeBSD-Includes/include -I../../../Misc
CFLAGS := $(IDIRS) -O3 -s -w -std=gnu++11 -ffunction-sections -fdata-sections -fno-builtin -fno-exceptions -fno-asynchronous-unwind-tables -nostartfiles -nostdlib -w -masm=intel -march=btver2 -mtune=btver2 -m64 -mabi=sysv -mcmodel=small -mstackrealign -fPIE -DVERSION_$(VERSION)
LFLAGS := -Xlinker -T Linker -Wl,--build-id=none -mstackrealign -pie -Wl,--gc-sections
SFLAGS := -nostartfiles -nostdlib -masm=intel -march=btver2 -mtune=btver2 -m64 -mabi=sysv -mcmodel=small
@@ -1,32 +1,32 @@
#pragma once
#define KERNELDRIVER
#define KDRIVER_MAJOR_VERSION 1
#define KDRIVER_MINOR_VERSION 0
#define KDRIVER_BUILD_VERSION 699
//Which software version we want to compile for
#define SOFTWARE_VERSION_NA
#ifdef VERSION_505
#define SOFTWARE_VERSION_STR "5.05"
#define SOFTWARE_VERSION_505
#undef SOFTWARE_VERSION_NA
#endif
#ifdef VERSION_672
#define SOFTWARE_VERSION_STR "6.72"
#define SOFTWARE_VERSION_672
#undef SOFTWARE_VERSION_NA
#endif
#ifdef VERSION_702
#define SOFTWARE_VERSION_STR "7.02"
#define SOFTWARE_VERSION_702
#undef SOFTWARE_VERSION_NA
#endif
#ifdef VERSION_755
#define SOFTWARE_VERSION_STR "7.55"
#define SOFTWARE_VERSION_755
#undef SOFTWARE_VERSION_NA
#endif
#ifdef VERSION_900
#define SOFTWARE_VERSION_STR "9.00"
#define SOFTWARE_VERSION_900
#undef SOFTWARE_VERSION_NA
#endif
#pragma once
#define KERNELDRIVER
#define KDRIVER_MAJOR_VERSION 1
#define KDRIVER_MINOR_VERSION 0
#define KDRIVER_BUILD_VERSION 708
//Which software version we want to compile for
#define SOFTWARE_VERSION_NA
#ifdef VERSION_505
#define SOFTWARE_VERSION_STR "5.05"
#define SOFTWARE_VERSION_505
#undef SOFTWARE_VERSION_NA
#endif
#ifdef VERSION_672
#define SOFTWARE_VERSION_STR "6.72"
#define SOFTWARE_VERSION_672
#undef SOFTWARE_VERSION_NA
#endif
#ifdef VERSION_702
#define SOFTWARE_VERSION_STR "7.02"
#define SOFTWARE_VERSION_702
#undef SOFTWARE_VERSION_NA
#endif
#ifdef VERSION_755
#define SOFTWARE_VERSION_STR "7.55"
#define SOFTWARE_VERSION_755
#undef SOFTWARE_VERSION_NA
#endif
#ifdef VERSION_900
#define SOFTWARE_VERSION_STR "9.00"
#define SOFTWARE_VERSION_900
#undef SOFTWARE_VERSION_NA
#endif
+1 -1
View File
@@ -1,4 +1,4 @@
open 192.168.0.55 2121
user anonymous anonymous
put "/mnt/c/Users/grego/source/repos/Orbis-Suite-2.0/Playstation/Kernel/Kernel/Kernel.elf" "/data/Orbis Suite/Kernel.505.ELF"
put "/mnt/e/Greg/Repos/Orbis-Suite-3.0/Playstation/Kernel/Kernel/Kernel.elf" "/data/Orbis Suite/Kernel.505.ELF"
bye
+2 -2
View File
@@ -5,7 +5,7 @@
extern "C"
{
int __cdecl module_start(size_t argc, const void *args)
int __cdecl module_start1(size_t argc, const void *args)
{
klog("!! Hello World !!\n");
@@ -26,7 +26,7 @@ extern "C"
return 0;
}
int __cdecl module_stop(size_t argc, const void *args)
int __cdecl module_stop1(size_t argc, const void *args)
{
klog("!! BYE !!\n");
+11 -11
View File
@@ -1,11 +1,11 @@
#pragma once
#define ORBIS_TOOLBOX_MAJOR 1
#define ORBIS_TOOLBOX_MINOR 0
#define ORBIS_TOOLBOX_BUILDVERSION 1249
#define stringify(a) stringify_(a)
#define stringify_(a) #a
#if defined(ORBIS_TOOLBOX_DEBUG)
#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox Alpha Version " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Dev Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
#else
#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox Alpha Version " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
#endif
#pragma once
#define ORBIS_TOOLBOX_MAJOR 1
#define ORBIS_TOOLBOX_MINOR 0
#define ORBIS_TOOLBOX_BUILDVERSION 1250
#define stringify(a) stringify_(a)
#define stringify_(a) #a
#if defined(ORBIS_TOOLBOX_DEBUG)
#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox Alpha Version " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Dev Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
#else
#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox Alpha Version " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
#endif