Mercurial > hg > CbC > CbC_xv6

changeset 355:045299ad7e97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
...
author anatofuz
date Mon, 15 Jun 2020 18:27:09 +0900
parents fde5f96c6ff1
children 599ad98aee00
files src/gearsTools/generate_context.pl src/usr/CMakeLists.txt
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/gearsTools/generate_context.pl	Fri Jun 12 20:44:01 2020 +0900
+++ b/src/gearsTools/generate_context.pl	Mon Jun 15 18:27:09 2020 +0900
@@ -252,7 +252,7 @@
 EOFEOF
 
 if ($project->{name} eq "gears") {
-    $mata_call .= <<"EOFEOF";
+    $meta_call .= <<"EOFEOF";
 __code exit_code(struct Context* ${context_name}) {
     free(${context_name}->code);
     free(${context_name}->data);
@@ -263,7 +263,7 @@
 
 } else {
 
-$mata_call .= <<"EOFEOF";
+$meta_call .= <<"EOFEOF";
 __code exit_code(struct Context* ${context_name}) {
     // free(${context_name}->code);
     // free(${context_name}->data);
@@ -273,7 +273,7 @@
 EOFEOF
 }
 
-$mata_call .= <<"EOFEOF";
+$meta_call .= <<"EOFEOF";
 __code exit_code_stub(struct Context* ${context_name}) {
     goto exit_code(${context_name});
 }    
--- a/src/usr/CMakeLists.txt	Fri Jun 12 20:44:01 2020 +0900
+++ b/src/usr/CMakeLists.txt	Mon Jun 15 18:27:09 2020 +0900
@@ -44,7 +44,7 @@
             add_custom_command (
                 OUTPUT    ${j}
                 DEPENDS   ${i}
-                COMMAND  "perl" "${CMAKE_SOURCE_DIR}/gearsTools/generate_stub.pl" "-o" ${j} ${i}
+                COMMAND  "perl" "${CMAKE_SOURCE_DIR}/gearsTools/generate_stub.pl" "--project" "xv6" "-o" ${j} ${i}
             )
             list(APPEND _Gears_CBC_SOURCES ${j})
         elseif (${i} MATCHES "\\.cu")
@@ -64,7 +64,7 @@
     add_custom_command (
           OUTPUT    CMakeFiles/${_Gears_TARGET}.dir/c/${_Gears_TARGET}-context.c
           DEPENDS   ${_Gears_CBC_SOURCES}
-          COMMAND  "cd" "CMakeFiles/${_Gears_TARGET}.dir" ";" "perl" "${CMAKE_SOURCE_DIR}/gearsTools/generate_context.pl" "-o" ${_Gears_TARGET} "-w" ${CMAKE_SOURCE_DIR}/usr/${_Gears_CSOURCES}
+          COMMAND  "cd" "CMakeFiles/${_Gears_TARGET}.dir" ";" "perl" "${CMAKE_SOURCE_DIR}/gearsTools/generate_context.pl" "--project" "xv6" "-o" ${_Gears_TARGET} "-w" ${CMAKE_SOURCE_DIR}/usr/${_Gears_CSOURCES}
     )
     add_executable(${_Gears_TARGET} ${_Gears_CBC_SOURCES} ${_Gears_CSOURCES} CMakeFiles/${_Gears_TARGET}.dir/c/${_Gears_TARGET}-context.c )
     target_link_libraries(${_Gears_TARGET} ulib)