aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bunnei <ericbunnie@gmail.com>2014-04-04 22:26:25 -0400
committerGravatar bunnei <ericbunnie@gmail.com>2014-04-04 22:26:25 -0400
commitc89f3a5c38be59c28dca54e0118b287023a2fada (patch)
tree72e51658129e70badfd2c39f5dacd1f94d10e4e1
parent69223d007ef70cbcbe4b0db47c00b2f4837f5d23 (diff)
added entry point loading from ELF file
-rw-r--r--src/core/src/loader.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/src/loader.cpp b/src/core/src/loader.cpp
index 7e7eb916..71ace20c 100644
--- a/src/core/src/loader.cpp
+++ b/src/core/src/loader.cpp
@@ -25,6 +25,7 @@
#include "file_util.h"
#include "loader.h"
#include "system.h"
+#include "core.h"
#include "file_sys/directory_file_system.h"
#include "elf/elf_reader.h"
@@ -71,10 +72,11 @@ bool Load_ELF(std::string &filename) {
elf_reader = new ElfReader(buffer);
elf_reader->LoadInto(0x00100000);
+ Core::g_app_core->SetPC(elf_reader->GetEntryPoint());
+
delete[] buffer;
delete elf_reader;
- }
- else {
+ } else {
return false;
}
f.Close();