Fixed names

Author: Timchenkovich

Diff for: asm/CMakeLists.txt

@@ -21,10 +21,10 @@ include_directories(
 # once instruction grammars are generated, initialize antlr generator chain
 antlr_target(
     IsaInstructionsLexer
-    ${asm_INSTRUCTION_LEXER}
+    ${asm_INSTRUCTIONS_LEXER}
     LEXER
     OUTPUT_DIRECTORY ${asm_GENERATED_DIR}
-    DEPENDS generateInstructionsGrammar ${asm_GRAMMAR_SOURCES} 
+    DEPENDS generateInstructionsGrammar ${asm__INSTRUCTIONS_GRAMMAR_SOURCES} 
 )
 
 antlr_target(
@@ -39,7 +39,7 @@ antlr_target(
 
 antlr_target( 
     IsaInstructionsParser
-    ${asm_INSTRUCTION_PARSER}
+    ${asm_INSTRUCTIONS_PARSER}
     PARSER
     DEPENDS_ANTLR AsmLexer
     OUTPUT_DIRECTORY ${asm_GENERATED_DIR}

Diff for: asm/cmake/BootstrapIsa.cmake

@@ -25,11 +25,11 @@ macro(bootstrap_isa isaPathStr)
 
 
     add_custom_command(
-    OUTPUT ${${isaName}_GENERATED_SOURCES} ${${isaName}_GRAMMAR_SOURCES}
+    OUTPUT ${${isaName}_GENERATED_SOURCES} ${${isaName}_INSTRUCTIONS_GRAMMAR_SOURCES}
     COMMAND mkdir -p ${outputDir} && cd ${outputDir} && ${CMAKE_BINARY_DIR}/asm/isa-creator/bootstrapIsa ${isaPath}
     DEPENDS ${CMAKE_BINARY_DIR}/asm/isa-creator/bootstrapIsa ${isaPath})
 
-    add_custom_target(generateInstructionGrammar DEPENDS ${${isaName}_INSTRUCTIONS_GRAMMAR_SOURCES})
+    add_custom_target(generateInstructionsGrammar DEPENDS ${${isaName}_INSTRUCTIONS_GRAMMAR_SOURCES})
 
     set(${isaName}_GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR}/${outputDir})
     set(${isaName}_ISA_SOURCES ${${isaName}_GENERATED_SOURCES})