Changes to deploy on linux and linux section finding for 64-bit (should have been part of the last commit).

runrevmark · runrevmark · commit 88b41f3ef380 · 2013-05-08T13:17:48.000+01:00
diff --git a/engine/src/deploy_linux.cpp b/engine/src/deploy_linux.cpp
@@ -398,13 +398,23 @@ struct MCLinuxELF32Traits
 	typedef Elf32_Ehdr Ehdr;
 	typedef Elf32_Shdr Shdr;
 	typedef Elf32_Phdr Phdr;
+	
+	inline static uint32_t round(uint32_t x)
+	{
+		return (x + 3) & ~3;
+	}
 };
 
 struct MCLinuxELF64Traits
 {
 	typedef Elf64_Ehdr Ehdr;
 	typedef Elf64_Shdr Shdr;
 	typedef Elf64_Phdr Phdr;
+	
+	inline static uint32_t round(uint32_t x)
+	{
+		return (x + 7) & ~7;
+	}
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -761,7 +771,10 @@ Exec_stat MCDeployToELF(const MCDeployParameters& p_params, bool p_is_android)
 	{
 		t_success = MCDeployWritePayload(p_params, false, t_output, t_output_offset, t_payload_size);
 		if (t_success)
+		{
+			t_payload_size = T::round(t_payload_size);
 			t_output_offset += t_payload_size;
+		}
 	}
 
 	// Write out the project info struct
@@ -773,7 +786,10 @@ Exec_stat MCDeployToELF(const MCDeployParameters& p_params, bool p_is_android)
 		t_project_offset = t_output_offset;
 		t_success = MCDeployWriteProject(p_params, false, t_output, t_output_offset, t_project_size);
 		if (t_success)
+		{
+			t_project_size = T::round(t_project_size);
 			t_output_offset += t_project_size;
+		}
 	}
 
 	// Next use the project size to compute the updated header values we need.
@@ -820,10 +836,10 @@ Exec_stat MCDeployToELF(const MCDeployParameters& p_params, bool p_is_android)
 
 		//
 
-		t_section_table_size = t_header . e_shnum * sizeof(Elf32_Shdr);
+		t_section_table_size = t_header . e_shnum * sizeof(typename T::Shdr);
 		t_section_table_offset = t_header . e_shoff;
 
-		t_segment_table_size = t_header . e_phnum * sizeof(Elf32_Phdr);
+		t_segment_table_size = t_header . e_phnum * sizeof(typename T::Phdr);
 		t_segment_table_offset = t_header . e_phoff;
 
 		//
diff --git a/engine/src/mode_installer.cpp b/engine/src/mode_installer.cpp
@@ -1874,6 +1874,19 @@ static void *MCExecutableFindSection(const char *p_name)
 #elif defined(_LINUX)
 #include <elf.h>
 
+// MW-2013-05-03: [[ Linux64 ]] Make sure we use the correct structs for section
+//   searching.
+
+#ifdef __LP64__
+typedef Elf64_Ehdr Elf_Ehdr;
+typedef Elf64_Shdr Elf_Shdr;
+typedef Elf64_Phdr Elf_Phdr;
+#else
+typedef Elf32_Ehdr Elf_Ehdr;
+typedef Elf32_Shdr Elf_Shdr;
+typedef Elf32_Phdr Elf_Phdr;
+#endif
+
 static void *MCExecutableFindSection(const char *p_name)
 {
 	bool t_success;
@@ -1891,22 +1904,22 @@ static void *MCExecutableFindSection(const char *p_name)
 	}
 
 	// Load the header
-	Elf32_Ehdr t_header;
+	Elf_Ehdr t_header;
 	if (t_success)
-		if (fread(&t_header, sizeof(Elf32_Ehdr), 1, t_exe) != 1)
+		if (fread(&t_header, sizeof(Elf_Ehdr), 1, t_exe) != 1)
 			t_success = false;
 
 	// Allocate memory for the section table
-	Elf32_Shdr *t_sections;
+	Elf_Shdr *t_sections;
 	t_sections = nil;
 	if (t_success)
-		t_success = MCMemoryAllocate(sizeof(Elf32_Shdr) * t_header . e_shnum, t_sections);
+		t_success = MCMemoryAllocate(sizeof(Elf_Shdr) * t_header . e_shnum, t_sections);
 
 	// Now read in the sections
 	for(uint32_t i = 0; i < t_header . e_shnum && t_success; i++)
 	{
 		if (fseek(t_exe, t_header . e_shoff + i * t_header . e_shentsize, SEEK_SET) != 0 ||
-			fread(&t_sections[i], sizeof(Elf32_Shdr), 1, t_exe) != 1)
+			fread(&t_sections[i], sizeof(Elf_Shdr), 1, t_exe) != 1)
 			t_success = false;
 	}
 
