[MHR-36] Giving priority to NVMe module suport.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

1 files changed, 50 insertions, 38 deletions

diff --git a/Boot/Sources/ProgramLoader.cxx b/Boot/Sources/ProgramLoader.cxx
index 90175bef..0603fb9c 100644
--- a/Boot/Sources/ProgramLoader.cxx
+++ b/Boot/Sources/ProgramLoader.cxx
@@ -7,60 +7,72 @@
 #include <BootKit/ProgramLoader.hxx>
 #include <BootKit/Vendor/Support.hxx>
 #include <BootKit/BootKit.hxx>
+
+EXTERN_C
+{
 #include <string.h>
+}
 
 namespace Boot
 {
 	ProgramLoader::ProgramLoader(VoidPtr blob)
 		: fBlob(blob), fStartAddress(nullptr)
 	{
-        // detect the format.
-        const char* firstBytes = reinterpret_cast<char*>(fBlob);
+		// detect the format.
+		const Char* firstBytes = reinterpret_cast<char*>(fBlob);
 
-        BTextWriter writer;
-        writer.WriteCharacter(firstBytes[0]).WriteCharacter(firstBytes[1]).WriteCharacter('\r').WriteCharacter('\n');
+		BTextWriter writer;
 
-        if (!firstBytes)
-        {
-            // failed to provide a valid pointer.
-            return;
-        }
+		if (!firstBytes)
+		{
+			// failed to provide a valid pointer.
+			return;
+		}
 
-        if (firstBytes[0] == 'M' &&
-            firstBytes[1] == 'Z')
-        {
-            // Parse PE32+
-            fStartAddress = nullptr;
-        }
-        else if (firstBytes[0] == 'J' &&
-            firstBytes[1] == 'o' &&
-            firstBytes[2] == 'y' &&
-            firstBytes[3] == '!')
-        {
-            // Parse Non FAT PEF.
-            fStartAddress = nullptr;
-        }
-        else
-        {
-            // probably a binary blob.
-            fStartAddress = fBlob;
-        }
-    }
+		if (firstBytes[0] == 'M' &&
+			firstBytes[1] == 'Z')
+		{
+			// Parse PE32+
+			fStartAddress = nullptr;
+			writer.Write("newosldr: MZ executable detected.\r");
+		}
+		else if (firstBytes[0] == 'J' &&
+				 firstBytes[1] == 'o' &&
+				 firstBytes[2] == 'y' &&
+				 firstBytes[3] == '!')
+		{
+			// Parse Non FAT PEF.
+			fStartAddress = nullptr;
+			writer.Write("newosldr: PEF executable detected.\r");
+		}
+		else
+		{
+			// probably a binary blob.
+			fStartAddress = fBlob;
+		}
+	}
 
 	Void ProgramLoader::Start(HEL::HandoverInformationHeader* handover)
 	{
-        if (!fStartAddress) return;
+		BTextWriter writer;
+		writer.Write("newosldr: running: ").Write(fBlobName).Write("\r");
+
+		if (!fStartAddress)
+		{
+			writer.Write("newosldr: exec error.\r");
+			return;
+		}
 
-        ((HEL::HandoverProc)fStartAddress)(handover);
+		((HEL::HandoverProc)fStartAddress)(handover);
 	}
 
 	const Char* ProgramLoader::GetName()
-    {
-        return fBlobName;
-    }
+	{
+		return fBlobName;
+	}
 
 	Void ProgramLoader::SetName(const Char* name)
-    {
-        CopyMem(fBlobName, name, StrLen(name));
-    }
-} // namespace Boot
\ No newline at end of file
+	{
+		CopyMem(fBlobName, name, StrLen(name));
+	}
+} // namespace Boot