From dd40c41ffc42d487c54d14fb716f0464c05fece9 Mon Sep 17 00:00:00 2001 From: Marcus Comstedt Date: Sun, 15 Sep 2019 09:42:52 +0200 Subject: bba: Default to native endian in bbasm Signed-off-by: Marcus Comstedt --- bba/main.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/bba/main.cc b/bba/main.cc index 32a68c63..b9cf6d8e 100644 --- a/bba/main.cc +++ b/bba/main.cc @@ -66,11 +66,17 @@ const char *skipWhitespace(const char *p) return p; } +bool testBigEndian() +{ + int n = 1; + return !*(const char *)&n; +} + int main(int argc, char **argv) { bool debug = false; bool verbose = false; - bool bigEndian = false; + bool bigEndian; bool writeC = false; char buffer[512]; @@ -81,6 +87,7 @@ int main(int argc, char **argv) options.add_options()("verbose,v", "verbose output"); options.add_options()("debug,d", "debug output"); options.add_options()("be,b", "big endian"); + options.add_options()("le,l", "little endian"); options.add_options()("c,c", "write c strings"); options.add_options()("files", po::value>(), "file parameters"); pos.add("files", -1); @@ -106,6 +113,10 @@ int main(int argc, char **argv) debug = true; if (vm.count("be")) bigEndian = true; + else if (vm.count("le")) + bigEndian = false; + else + bigEndian = testBigEndian(); if (vm.count("c")) writeC = true; -- cgit v1.2.3 From 3d9ce8836c4c82fdb7f74ef3def1c4c85a0e1a1c Mon Sep 17 00:00:00 2001 From: Marcus Comstedt Date: Sun, 15 Sep 2019 12:30:03 +0200 Subject: bba: Require explicit endianness flag, and supply it Signed-off-by: Marcus Comstedt --- bba/bba.cmake | 8 ++++++++ bba/main.cc | 12 ++++-------- ecp5/family.cmake | 4 ++-- ice40/family.cmake | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/bba/bba.cmake b/bba/bba.cmake index 3e094277..a6995ca3 100644 --- a/bba/bba.cmake +++ b/bba/bba.cmake @@ -11,3 +11,11 @@ ENDIF(NOT CMAKE_CROSSCOMPILING) IF(NOT CMAKE_CROSSCOMPILING) EXPORT(TARGETS bbasm FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake ) ENDIF(NOT CMAKE_CROSSCOMPILING) + +include(TestBigEndian) +TEST_BIG_ENDIAN(IS_BIG_ENDIAN) +if(IS_BIG_ENDIAN) + set(BBASM_ENDIAN_FLAG "--be") +else() + set(BBASM_ENDIAN_FLAG "--le") +endif() diff --git a/bba/main.cc b/bba/main.cc index b9cf6d8e..d4d16e12 100644 --- a/bba/main.cc +++ b/bba/main.cc @@ -66,12 +66,6 @@ const char *skipWhitespace(const char *p) return p; } -bool testBigEndian() -{ - int n = 1; - return !*(const char *)&n; -} - int main(int argc, char **argv) { bool debug = false; @@ -115,8 +109,10 @@ int main(int argc, char **argv) bigEndian = true; else if (vm.count("le")) bigEndian = false; - else - bigEndian = testBigEndian(); + else { + printf("Endian parameter is mandatory\n"); + exit(-1); + } if (vm.count("c")) writeC = true; diff --git a/ecp5/family.cmake b/ecp5/family.cmake index ec857569..4fe45a0d 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -45,7 +45,7 @@ if (NOT EXTERNAL_CHIPDB) DEPENDS ${DB_PY} ${PREV_DEV_CC_BBA_DB} ) add_custom_command(OUTPUT ${DEV_CC_DB} - COMMAND bbasm ${DEV_CC_BBA_DB} ${DEV_CC_DB} + COMMAND bbasm ${BBASM_ENDIAN_FLAG} ${DEV_CC_BBA_DB} ${DEV_CC_DB} DEPENDS bbasm ${DEV_CC_BBA_DB} ) if (SERIALIZE_CHIPDB) @@ -70,7 +70,7 @@ if (NOT EXTERNAL_CHIPDB) DEPENDS ${DB_PY} ${PREV_DEV_CC_BBA_DB} ) add_custom_command(OUTPUT ${DEV_CC_DB} - COMMAND bbasm --c ${DEV_CC_BBA_DB} ${DEV_CC_DB}.new + COMMAND bbasm --c ${BBASM_ENDIAN_FLAG} ${DEV_CC_BBA_DB} ${DEV_CC_DB}.new COMMAND mv ${DEV_CC_DB}.new ${DEV_CC_DB} DEPENDS bbasm ${DEV_CC_BBA_DB} ) diff --git a/ice40/family.cmake b/ice40/family.cmake index 6c46f459..3679a72e 100644 --- a/ice40/family.cmake +++ b/ice40/family.cmake @@ -44,7 +44,7 @@ if (NOT EXTERNAL_CHIPDB) DEPENDS ${DEV_CONSTIDS_INC} ${DEV_GFXH} ${DEV_TXT_DB} ${DB_PY} ${PREV_DEV_CC_BBA_DB} ) add_custom_command(OUTPUT ${DEV_CC_DB} - COMMAND bbasm ${DEV_CC_BBA_DB} ${DEV_CC_DB} + COMMAND bbasm ${BBASM_ENDIAN_FLAG} ${DEV_CC_BBA_DB} ${DEV_CC_DB} DEPENDS bbasm ${DEV_CC_BBA_DB} ) if (SERIALIZE_CHIPDB) @@ -84,7 +84,7 @@ if (NOT EXTERNAL_CHIPDB) DEPENDS ${DEV_CONSTIDS_INC} ${DEV_GFXH} ${DEV_TXT_DB} ${DB_PY} ${PREV_DEV_CC_BBA_DB} ) add_custom_command(OUTPUT ${DEV_CC_DB} - COMMAND bbasm --c ${DEV_CC_BBA_DB} ${DEV_CC_DB}.new + COMMAND bbasm --c ${BBASM_ENDIAN_FLAG} ${DEV_CC_BBA_DB} ${DEV_CC_DB}.new COMMAND mv ${DEV_CC_DB}.new ${DEV_CC_DB} DEPENDS bbasm ${DEV_CC_BBA_DB} ) -- cgit v1.2.3 From 2f9b04fd5642fcb1346b51d3a63367c09fc61486 Mon Sep 17 00:00:00 2001 From: Marcus Comstedt Date: Sun, 15 Sep 2019 13:27:41 +0200 Subject: CMake: Generate chipdbs in build tree when building out-of-tree Signed-off-by: Marcus Comstedt --- ecp5/family.cmake | 7 ++++--- ice40/family.cmake | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ecp5/family.cmake b/ecp5/family.cmake index 4fe45a0d..a1043762 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -22,7 +22,8 @@ if (NOT EXTERNAL_CHIPDB) set(DB_PY ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/trellis_import.py) file(MAKE_DIRECTORY ecp5/chipdbs/) - add_library(ecp5_chipdb OBJECT ecp5/chipdbs/) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/) + add_library(ecp5_chipdb OBJECT ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/) target_compile_definitions(ecp5_chipdb PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family}) target_include_directories(ecp5_chipdb PRIVATE ${family}/) @@ -37,7 +38,7 @@ if (NOT EXTERNAL_CHIPDB) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ecp5/resources/chipdb.rc PROPERTIES LANGUAGE RC) set(PREV_DEV_CC_BBA_DB) foreach (dev ${devices}) - set(DEV_CC_DB ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/chipdbs/chipdb-${dev}.bin) + set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/chipdb-${dev}.bin) set(DEV_CC_BBA_DB ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/chipdbs/chipdb-${dev}.bba) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/constids.inc) add_custom_command(OUTPUT ${DEV_CC_BBA_DB} @@ -61,7 +62,7 @@ if (NOT EXTERNAL_CHIPDB) target_compile_options(ecp5_chipdb PRIVATE -g0 -O0 -w) set(PREV_DEV_CC_BBA_DB) foreach (dev ${devices}) - set(DEV_CC_DB ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/chipdbs/chipdb-${dev}.cc) + set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/chipdb-${dev}.cc) set(DEV_CC_BBA_DB ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/chipdbs/chipdb-${dev}.bba) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/constids.inc) add_custom_command(OUTPUT ${DEV_CC_BBA_DB} diff --git a/ice40/family.cmake b/ice40/family.cmake index 3679a72e..8b2c4385 100644 --- a/ice40/family.cmake +++ b/ice40/family.cmake @@ -12,7 +12,8 @@ if (NOT EXTERNAL_CHIPDB) set(ICEBOX_ROOT "/usr/local/share/icebox" CACHE STRING "icebox location root") file(MAKE_DIRECTORY ice40/chipdbs/) - add_library(ice40_chipdb OBJECT ice40/chipdbs/) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/) + add_library(ice40_chipdb OBJECT ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/) target_compile_definitions(ice40_chipdb PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family}) target_include_directories(ice40_chipdb PRIVATE ${family}/) @@ -36,7 +37,7 @@ if (NOT EXTERNAL_CHIPDB) endif() set(DEV_TXT_DB ${ICEBOX_ROOT}/chipdb-${dev}.txt) set(DEV_CC_BBA_DB ${CMAKE_CURRENT_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.bba) - set(DEV_CC_DB ${CMAKE_CURRENT_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.bin) + set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.bin) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/constids.inc) set(DEV_GFXH ${CMAKE_CURRENT_SOURCE_DIR}/ice40/gfx.h) add_custom_command(OUTPUT ${DEV_CC_BBA_DB} @@ -75,7 +76,7 @@ if (NOT EXTERNAL_CHIPDB) endif() set(DEV_TXT_DB ${ICEBOX_ROOT}/chipdb-${dev}.txt) set(DEV_CC_BBA_DB ${CMAKE_CURRENT_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.bba) - set(DEV_CC_DB ${CMAKE_CURRENT_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.cc) + set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.cc) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/constids.inc) set(DEV_GFXH ${CMAKE_CURRENT_SOURCE_DIR}/ice40/gfx.h) add_custom_command(OUTPUT ${DEV_CC_BBA_DB} -- cgit v1.2.3