x86: add build system hooks for page tables

We need to produce a binary set of page tables wired together
by physical address. Add build system logic to use the script
to produce them.

Some logic for running build scripts that produce artifacts moved
out of IA32 into common CMake code.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>

arch/x86/CMakeLists.txt

@@ -1,8 +1,56 @@
 # Copyright (c) 2019 Intel Corp.
 # SPDX-License-Identifier: Apache-2.0
 
+# Convert the .bin file argument to a .o file, create a wrapper
+# library for the .o file, and register the library as a generated
+# file that is to be linked in after the first link.
+function(add_bin_file_to_the_next_link target_dependency bin)
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${bin}.o
+    COMMAND
+    ${CMAKE_OBJCOPY}
+    -I binary
+    -B ${OUTPUT_ARCH}
+    -O ${OUTPUT_FORMAT}
+    --rename-section .data=${bin},CONTENTS,ALLOC,LOAD,READONLY,DATA
+    ${bin}.bin
+    ${bin}.o
+    DEPENDS ${target_dependency} ${bin}.bin
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+  add_custom_target(${bin}_o DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${bin}.o)
+  add_library(${bin} STATIC IMPORTED GLOBAL)
+  set_property(TARGET ${bin} PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${bin}.o)
+  add_dependencies(${bin} ${bin}_o)
+  set_property(GLOBAL APPEND PROPERTY GENERATED_KERNEL_OBJECT_FILES ${bin})
+endfunction()
+
 if(CONFIG_X86_64)
   include(intel64.cmake)
 else()
   include(ia32.cmake)
 endif()
+
+# Always set for 64-bit (long mode requires page tables), optional for 32-bit
+if (CONFIG_MMU)
+  set(GEN_MMU ${ZEPHYR_BASE}/arch/x86/gen_mmu.py)
+
+  add_custom_target(
+    pagetables_bin_target
+    DEPENDS
+    pagetables.bin
+  )
+  add_custom_command(
+    OUTPUT pagetables.bin
+    COMMAND
+    ${PYTHON_EXECUTABLE}
+    ${GEN_MMU}
+    --kernel $<TARGET_FILE:${ZEPHYR_PREBUILT_EXECUTABLE}>
+    --output pagetables.bin
+    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${ZEPHYR_PREBUILT_EXECUTABLE} ${GEN_MMU}
+  )
+
+  add_bin_file_to_the_next_link(pagetables_bin_target pagetables)
+endif()

arch/x86/ia32.cmake

@@ -65,29 +65,7 @@ add_subdirectory(core)
 get_property(OUTPUT_ARCH   GLOBAL PROPERTY PROPERTY_OUTPUT_ARCH)
 get_property(OUTPUT_FORMAT GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT)
 
-# Convert the .bin file argument to a .o file, create a wrapper
-# library for the .o file, and register the library as a generated
-# file that is to be linked in after the first link.
-function(add_bin_file_to_the_next_link target_dependency bin)
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${bin}.o
-    COMMAND
-    ${CMAKE_OBJCOPY}
-    -I binary
-    -B ${OUTPUT_ARCH}
-    -O ${OUTPUT_FORMAT}
-    --rename-section .data=${bin},CONTENTS,ALLOC,LOAD,READONLY,DATA
-    ${bin}.bin
-    ${bin}.o
-    DEPENDS ${target_dependency} ${bin}.bin
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    )
-  add_custom_target(${bin}_o DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${bin}.o)
-  add_library(${bin} STATIC IMPORTED GLOBAL)
-  set_property(TARGET ${bin} PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${bin}.o)
-  add_dependencies(${bin} ${bin}_o)
-  set_property(GLOBAL APPEND PROPERTY GENERATED_KERNEL_OBJECT_FILES ${bin})
-endfunction()
+
 
 add_bin_file_to_the_next_link(gen_idt_output staticIdt)
 add_bin_file_to_the_next_link(gen_idt_output irq_int_vector_map)

arch/x86/intel64.cmake

@@ -3,4 +3,9 @@
 
 zephyr_cc_option(-m64)
 
+set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_ARCH "i386:x86-64")
+set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf64-x86-64")
+get_property(OUTPUT_ARCH   GLOBAL PROPERTY PROPERTY_OUTPUT_ARCH)
+get_property(OUTPUT_FORMAT GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT)
+
 add_subdirectory(core)