Update preprocess process

Author: fjtrujy

cmake/preprocess_vu1.cmake

@@ -1,54 +1,69 @@
-# VU1 preprocessing script
-# Usage: cmake -D INPUT=<input> -D OUTPUT=<output> -D STEP=<step> -D SOURCE_DIR=<dir> -D COMPILER=<cc> -D MEM_HEADER=<header> -P preprocess_vu1.cmake
+# VU1 preprocessing script - Simplified version
+# Usage: cmake -D INPUT=<input> -D OUTPUT=<output> -D STEP=<step> -D SOURCE_DIR=<dir> -D COMPILER=<cc> -D MEM_HEADER=<header> -D GASP_TOOL=<masp> -P preprocess_vu1.cmake
 
 if(STEP STREQUAL "pp1")
-    # Step 1: Remove #include, #define, fix .include paths
-    execute_process(
-        COMMAND /bin/bash -c "cat ${INPUT} | sed -E 's/#include[[:space:]]+.+// ; s/#define[[:space:]]+.+// ; s|(\\.include[[:space:]]+)\\\"([^/].+)\\\"|\\1\\\"${SOURCE_DIR}/vu1/\\2\\\"|' > ${OUTPUT}"
-        RESULT_VARIABLE result
-    )
-    if(NOT result EQUAL 0)
-        message(FATAL_ERROR "Step 1 preprocessing failed")
-    endif()
+    # Step 1: Clean up C preprocessor directives and fix .include paths
+    # - Remove #include and #define (will use gasp-style includes and C preprocessor later)
+    # - Fix .include paths to be absolute
+    file(READ "${INPUT}" content)
+    # Remove #include lines
+    string(REGEX REPLACE "#include[^\n]*\n" "" content "${content}")
+    # Remove #define lines
+    string(REGEX REPLACE "#define[^\n]*\n" "" content "${content}")
+    # Fix .include paths to be absolute (only for relative paths)
+    # Note: CMake regex doesn't support [[:space:]], use [ \t] instead
+    string(REGEX REPLACE "\\.include[ \t]+\"([^/][^\"]*)\"" ".include \"${SOURCE_DIR}/vu1/\\1\"" content "${content}")
+    file(WRITE "${OUTPUT}" "${content}")
 
 elseif(STEP STREQUAL "pp2")
-    # Step 2: gasp/masp preprocessor
+    # Step 2: gasp/masp preprocessor for macro expansion
     if(NOT DEFINED GASP_TOOL)
         message(FATAL_ERROR "GASP_TOOL not defined")
     endif()
-    # Use wrapper script for better error handling
+
+    # Run masp directly
     execute_process(
-        COMMAND ${SOURCE_DIR}/cmake/run_masp.sh ${GASP_TOOL} ${SOURCE_DIR}/vu1 ${OUTPUT} ${INPUT}
+        COMMAND "${GASP_TOOL}" -c ";" -I"${SOURCE_DIR}/vu1" -o "${OUTPUT}" "${INPUT}"
         RESULT_VARIABLE result
         OUTPUT_VARIABLE output
         ERROR_VARIABLE error
     )
     if(NOT result EQUAL 0)
-        message(FATAL_ERROR "Step 2 preprocessing (${GASP_TOOL}) failed\nOutput: ${output}\nError: ${error}\nInput: ${INPUT}\nOutput: ${OUTPUT}")
+        message(FATAL_ERROR "masp failed (exit ${result})\nCommand: ${GASP_TOOL} -c \";\" -I${SOURCE_DIR}/vu1 -o ${OUTPUT} ${INPUT}\nOutput: ${output}\nError: ${error}")
+    endif()
+    if(NOT EXISTS "${OUTPUT}")
+        message(FATAL_ERROR "masp did not create output file: ${OUTPUT}")
     endif()
 
 elseif(STEP STREQUAL "pp3")
     # Step 3: Array notation conversion
-    execute_process(
-        COMMAND /bin/bash -c "cat ${INPUT} | sed -E 's/\\[([0-9])\\]/_\\1/g ; s/\\[([w-zW-Z])\\]/\\1/g' > ${OUTPUT}"
-        RESULT_VARIABLE result
-    )
-    if(NOT result EQUAL 0)
-        message(FATAL_ERROR "Step 3 preprocessing failed")
-    endif()
+    # Convert [0] -> _0, [1] -> _1, etc.
+    # Convert [x] -> x, [y] -> y, etc. (vector component access)
+    file(READ "${INPUT}" content)
+    string(REGEX REPLACE "\\[([0-9])\\]" "_\\1" content "${content}")
+    string(REGEX REPLACE "\\[([w-zW-Z])\\]" "\\1" content "${content}")
+    file(WRITE "${OUTPUT}" "${content}")
 
 elseif(STEP STREQUAL "pp4")
-    # Step 4: C preprocessor with memory layout
-    # Use -w to suppress warnings about unmatched quotes in assembly comments
-    # Escape backslashes before preprocessing, then restore them after
-    # This preserves masp/gasp local labels like \xformed_vert while allowing normal C preprocessing
+    # Step 4: C preprocessor for memory layout evaluation
+    if(NOT DEFINED COMPILER)
+        message(FATAL_ERROR "COMPILER not defined")
+    endif()
+    if(NOT DEFINED MEM_HEADER)
+        message(FATAL_ERROR "MEM_HEADER not defined")
+    endif()
+
+    # Use -x assembler-with-cpp to force GCC to preprocess .vcl files as assembly
     execute_process(
-        COMMAND /bin/bash -c "sed 's/\\\\/\\\\\\\\/g' ${INPUT} | ${COMPILER} -E -P -w -I${SOURCE_DIR}/vu1 -imacros ${MEM_HEADER} - | sed 's/\\\\\\\\/\\\\/g' > ${OUTPUT}"
+        COMMAND "${COMPILER}" -E -P -w -x assembler-with-cpp -I"${SOURCE_DIR}/vu1" -imacros "${MEM_HEADER}" "${INPUT}"
         RESULT_VARIABLE result
+        OUTPUT_VARIABLE output
+        ERROR_VARIABLE error
     )
     if(NOT result EQUAL 0)
-        message(FATAL_ERROR "Step 4 preprocessing failed")
+        message(FATAL_ERROR "C preprocessor failed (exit ${result})\nError: ${error}")
     endif()
+    file(WRITE "${OUTPUT}" "${output}")
 
 else()
     message(FATAL_ERROR "Unknown step: ${STEP}")