Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2024-11-28 23:49:26 +00:00
Code Issues Projects Releases Wiki Activity

use new loader code

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-08-18 00:21:37 -04:00
parent 49dcba4173
commit 7858711902
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/loader.cpp
View File

@ -47,6 +47,7 @@
#include <toolbox/toolbox.h> #include <toolbox/toolbox.h>
#include <toolbox/mm.h> #include <toolbox/mm.h>
#include <toolbox/os.h> #include <toolbox/os.h>
#include <toolbox/loader.h>
#include <mpw/mpw.h> #include <mpw/mpw.h>
@ -58,6 +59,9 @@
#include "loader.h" #include "loader.h"
#include "debugger.h" #include "debugger.h"
#define LOADER_LOAD
Settings Flags; Settings Flags;
const uint32_t kGlobalSize = 0x10000; const uint32_t kGlobalSize = 0x10000;
@ -130,6 +134,7 @@ void WriteLong(void *data, uint32_t offset, uint32_t value)
((uint8_t *)data)[offset++] = value; ((uint8_t *)data)[offset++] = value;
} }
#ifndef LOADER_LOAD
void reloc1(const uint8_t *r, uint32_t address, uint32_t offset) void reloc1(const uint8_t *r, uint32_t address, uint32_t offset)
{ {
// %00000000 00000000 -> break // %00000000 00000000 -> break
@ -390,7 +395,7 @@ uint32_t load(const char *file)
// set pc to jump table entry 0. // set pc to jump table entry 0.
return returnAddress; return returnAddress;
} }
#endif
void GlobalInit() void GlobalInit()
@ -899,10 +904,13 @@ int main(int argc, char **argv)
CreateStack(); CreateStack();
#ifdef LOADER_LOAD
uint16_t err = Loader::Native::LoadFile(command);
if (err) exit(EX_CONFIG);
#else
uint32_t address = load(command.c_str()); uint32_t address = load(command.c_str());
if (!address) exit(EX_CONFIG); if (!address) exit(EX_CONFIG);
#endif
GlobalInit(); GlobalInit();
@ -925,9 +933,9 @@ int main(int argc, char **argv)
// else do it manually below. // else do it manually below.
} }
#ifndef LOADER_LOAD
cpuInitializeFromNewPC(address); cpuInitializeFromNewPC(address);
#endif
if (Flags.debugger) Debug::Shell(); if (Flags.debugger) Debug::Shell();
else MainLoop(); else MainLoop();