From 98197ec8eaae3dc781c6c98beb33d17894929629 Mon Sep 17 00:00:00 2001
From: Nathan Giddings <nathang567@gmail.com>
Date: Sun, 2 Aug 2020 18:30:54 -0500
Subject: [PATCH] Renamed elf.cpp to module.cpp, started Module class

---
 src/{elf.cpp => module.cpp} | 17 +++++++++++------
 src/{elf.hpp => module.hpp} | 22 +++++++++++++++++++++-
 2 files changed, 32 insertions(+), 7 deletions(-)
 rename src/{elf.cpp => module.cpp} (56%)
 rename src/{elf.hpp => module.hpp} (92%)

diff --git a/src/elf.cpp b/src/module.cpp
similarity index 56%
rename from src/elf.cpp
rename to src/module.cpp
index ff503ab..e327acf 100644
--- a/src/elf.cpp
+++ b/src/module.cpp
@@ -1,20 +1,25 @@
 #include "elf.hpp"
 #include "util.hpp"
 
+kernel::ELF::ELF()
+{
+    this->m_fileLocation = (void*) NULL;
+}
+
 kernel::ELF::ELF(void* location)
 {
-    this->location = location;
+    this->m_fileLocation = location;
 }
 
 void* kernel::ELF::entry()
 {
-    Header* fileHeader = (Header*) location;
+    Header* fileHeader = (Header*) m_fileLocation;
     return fileHeader->entry;
 }
 
 int kernel::ELF::validate()
 {
-    Header* fileHeader = (Header*) location;
+    Header* fileHeader = (Header*) m_fileLocation;
     if(fileHeader->magic != 0x464c457f)
         return -1;
     else if((ISA) fileHeader->machine != HOST_ISA)
@@ -26,14 +31,14 @@ int kernel::ELF::validate()
 
 int kernel::ELF::load()
 {
-    Header* fileHeader = (Header*) location;
-    ProgramHeader* programHeader = (ProgramHeader*) ((size_t) location + fileHeader->phoffset);
+    Header* fileHeader = (Header*) m_fileLocation;
+    ProgramHeader* programHeader = (ProgramHeader*) ((size_t) m_fileLocation + fileHeader->phoffset);
     int count = (int) fileHeader->phcount;
     for(int i = 0; i < count; i++)
     {
         if((SegmentType) programHeader->type != Load)
             continue;
-        memcpy(programHeader->vaddr, location + programHeader->offset, programHeader->filesize);
+        memcpy(programHeader->vaddr, m_fileLocation + programHeader->offset, programHeader->filesize);
     }
     return 0;
 }
\ No newline at end of file
diff --git a/src/elf.hpp b/src/module.hpp
similarity index 92%
rename from src/elf.hpp
rename to src/module.hpp
index bf62255..9f7748d 100644
--- a/src/elf.hpp
+++ b/src/module.hpp
@@ -123,6 +123,8 @@ public:
     static const ISA HOST_ISA = aarch64;
 #endif
 
+    ELF();
+
     ELF(void* location);
 
     void* entry();
@@ -133,7 +135,25 @@ public:
 
 private:
 
-    void* location;
+    void* m_fileLocation;
+
+};
+
+class Module
+{
+public:
+
+    Module();
+
+    Module(physaddr_t start, physaddr_t end);
+
+private:
+
+    physaddr_t m_start;
+
+    physaddr_t m_end;
+
+    ELF binary;
 
 };