easm: Split to separate subdirectory.

envytools · Jul 27, 2012 · 955a147 · 955a147
1 parent 0181c3e
commit 955a147
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 2.6)
 SET(CMAKE_C_FLAGS "-g -O2 -Wall")
 
 add_subdirectory(util)
+add_subdirectory(easm)
 add_subdirectory(nva)
 add_subdirectory(rnn)
 add_subdirectory(envydis)

diff --git a/README b/README
@@ -17,6 +17,7 @@ Subdirectories:
  - nva: Tools to directly access the GPU registers
  - vstream: Tools to decode and encode raw video bitstreams
  - vdpow: A tool aiding in VP3 reverse engineering
+ - easm: Utility code dealing with assembly language parsing & printing.
  - util: Misc utility code shared between envytools modules
 
 

diff --git a/easm/.gitignore b/easm/.gitignore
@@ -0,0 +1,5 @@
+easm_lex.c
+easm_lex.h
+easm_parse.c
+easm_parse.h
+libeasm.a
diff --git a/easm/CMakeLists.txt b/easm/CMakeLists.txt
@@ -0,0 +1,22 @@
+project(ENVYTOOLS C)
+cmake_minimum_required(VERSION 2.6)
+
+find_package(FLEX REQUIRED)
+find_package(BISON REQUIRED)
+
+include_directories(../include)
+
+flex_target(easm_lex easm_lex.l ${CMAKE_CURRENT_BINARY_DIR}/easm_lex.c)
+bison_target(easm_parse easm_parse.y ${CMAKE_CURRENT_BINARY_DIR}/easm_parse.c)
+add_flex_bison_dependency(easm_lex easm_parse)
+
+include_directories(.)
+
+add_library(easm easm.c ${FLEX_easm_lex_OUTPUTS} ${BISON_easm_parse_OUTPUTS} easm_print.c)
+
+target_link_libraries(easm envyutil)
+
+install(TARGETS easm
+	RUNTIME DESTINATION bin
+	LIBRARY DESTINATION lib${LIB_SUFFIX}
+	ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/envydis/easm.c → easm/easm.c b/envydis/easm.c → easm/easm.c
diff --git a/envydis/easm_lex.l → easm/easm_lex.l b/envydis/easm_lex.l → easm/easm_lex.l
diff --git a/envydis/easm_parse.y → easm/easm_parse.y b/envydis/easm_parse.y → easm/easm_parse.y
diff --git a/envydis/easm_print.c → easm/easm_print.c b/envydis/easm_print.c → easm/easm_print.c
diff --git a/envydis/.gitignore b/envydis/.gitignore
@@ -1,8 +1,3 @@
 envydis
 envyas
-easm_lex.c
-easm_lex.h
-easm_parse.c
-easm_parse.h
 libenvy.a
-libeasm.a
diff --git a/envydis/CMakeLists.txt b/envydis/CMakeLists.txt
@@ -3,30 +3,18 @@ cmake_minimum_required(VERSION 2.6)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces")
 
-find_package(FLEX REQUIRED)
-find_package(BISON REQUIRED)
-
 include_directories(../include)
 
-flex_target(easm_lex easm_lex.l ${CMAKE_CURRENT_BINARY_DIR}/easm_lex.c)
-bison_target(easm_parse easm_parse.y ${CMAKE_CURRENT_BINARY_DIR}/easm_parse.c)
-add_flex_bison_dependency(easm_lex easm_parse)
-
-include_directories(.)
-
 add_library(envy core.c nv50.c nvc0.c ctx.c fuc.c hwsq.c vp2.c vuc.c macro.c vp1.c)
 
-add_library(easm easm.c ${FLEX_easm_lex_OUTPUTS} ${BISON_easm_parse_OUTPUTS} easm_print.c)
-
 add_executable(envydis envydis.c)
 add_executable(envyas envyas.c convert.c)
 
-target_link_libraries(easm envyutil)
 target_link_libraries(envy envyutil easm)
 target_link_libraries(envydis envy)
 target_link_libraries(envyas envy envyutil)
 
-install(TARGETS envydis envy easm envyas
+install(TARGETS envydis envy envyas
 	RUNTIME DESTINATION bin
 	LIBRARY DESTINATION lib${LIB_SUFFIX}
 	ARCHIVE DESTINATION lib${LIB_SUFFIX})