Split nes and nes-nrom platforms.

Author: mysterymath

mos-platform/CMakeLists.txt

@@ -39,6 +39,7 @@ add_subdirectory(common)
 add_subdirectory(atari8)
 add_subdirectory(c64)
 add_subdirectory(sim)
+add_subdirectory(nes)
 add_subdirectory(nes-nrom)
 add_subdirectory(nes-nrom-128)
 add_subdirectory(nes-nrom-256)

mos-platform/nes-nrom/CMakeLists.txt

@@ -1,35 +1,13 @@
-platform(nes-nrom PARENT common)
+platform(nes-nrom PARENT nes)
 
 if(NOT CMAKE_CROSSCOMPILING)
   return()
 endif()
 
-install(FILES ppu.h TYPE INCLUDE)
 install(FILES
-  ppu.h
   nes-nrom.ld
-  ines-header.ld
   ines-flags.ld
 TYPE LIB)
 
-add_platform_object_file(nes-nrom-crt0-o crt0.o
-  crt0.c
-  ines.s
-)
-merge_libraries(nes-nrom-crt0-o common-crt0-o)
-
-add_platform_library(nes-nrom-crt0)
-merge_libraries(nes-nrom-crt0
-  common-crt0
-  common-copy-data
-  common-init-stack
-  common-zero-bss
-  common-exit-loop
-)
-
-add_platform_library(nes-nrom-c
-  ppu.c
-  ppu.s
-)
-merge_libraries(nes-nrom-c common-c)
-target_include_directories(nes-nrom-c SYSTEM BEFORE PUBLIC .)
+add_platform_object_file(nes-nrom-crt0-o crt0.o ines.s)
+merge_libraries(nes-nrom-crt0-o nes-crt0-o)

mos-platform/nes-nrom/nes-nrom.ld

@@ -33,8 +33,4 @@ SECTIONS {
   .vector 0xfffa : { SHORT(nmi) SHORT(_start) SHORT(irq) } >prg_rom
 }
 
-/* Provide imaginary (zero page) registers. */
-PROVIDE(__rc0 = 0x0000);
-INCLUDE imag-regs.ld
-ASSERT(__rc0 == 0x0000, "Inconsistent zero page map.")
-ASSERT(__rc31 == 0x001f, "Inconsistent zero page map.")
+INCLUDE nes-imag-regs.ld

mos-platform/nes/CMakeLists.txt

@@ -0,0 +1,33 @@
+platform(nes PARENT common)
+
+if(NOT CMAKE_CROSSCOMPILING)
+  return()
+endif()
+
+install(FILES ppu.h TYPE INCLUDE)
+install(FILES
+  ppu.h
+  ines-header.ld
+  nes-imag-regs.ld
+TYPE LIB)
+
+add_platform_object_file(nes-crt0-o crt0.o
+  crt0.c
+)
+merge_libraries(nes-crt0-o common-crt0-o)
+
+add_platform_library(nes-crt0)
+merge_libraries(nes-crt0
+  common-crt0
+  common-copy-data
+  common-init-stack
+  common-zero-bss
+  common-exit-loop
+)
+
+add_platform_library(nes-c
+  ppu.c
+  ppu.s
+)
+merge_libraries(nes-c common-c)
+target_include_directories(nes-c SYSTEM BEFORE PUBLIC .)

mos-platform/nes-nrom/crt0.c renamed to mos-platform/nes/crt0.c

@@ -0,0 +1,5 @@
+/* Provide imaginary (zero page) registers. */
+PROVIDE(__rc0 = 0x0000);
+INCLUDE imag-regs.ld
+ASSERT(__rc0 == 0x0000, "Inconsistent zero page map.")
+ASSERT(__rc31 == 0x001f, "Inconsistent zero page map.")