caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #298 from YosysHQ/clifford/bbasm

Browse Source 
Improvements in bbasm
This commit is contained in:
David Shah 2019-06-27 08:49:40 +01:00 committed by GitHub
commit c57137e17d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bba/main.cc
View File

@ -77,10 +77,11 @@ int main(int argc, char **argv)
namespace po = boost::program_options; namespace po = boost::program_options;
po::positional_options_description pos; po::positional_options_description pos;
po::options_description options("Allowed options"); po::options_description options("Allowed options");
options.add_options()("v", "verbose output"); options.add_options()("help,h", "verbose output");
options.add_options()("d", "debug output"); options.add_options()("verbose,v", "verbose output");
options.add_options()("b", "big endian"); options.add_options()("debug,d", "debug output");
options.add_options()("c", "write c strings"); options.add_options()("be,b", "big endian");
options.add_options()("c,c", "write c strings");
options.add_options()("files", po::value<std::vector<std::string>>(), "file parameters"); options.add_options()("files", po::value<std::vector<std::string>>(), "file parameters");
pos.add("files", -1); pos.add("files", -1);
@ -95,11 +96,15 @@ int main(int argc, char **argv)
std::cout << e.what() << "\n"; std::cout << e.what() << "\n";
return 1; return 1;
} }
if (vm.count("v")) if (vm.count("help")) {
std::cout << options;
return 0;
}
if (vm.count("verbose"))
verbose = true; verbose = true;
if (vm.count("d")) if (vm.count("debug"))
debug = true; debug = true;
if (vm.count("b")) if (vm.count("be"))
bigEndian = true; bigEndian = true;
if (vm.count("c")) if (vm.count("c"))
writeC = true; writeC = true;
@ -183,6 +188,7 @@ int main(int argc, char **argv)
const char *value = skipWhitespace(strtok(nullptr, "\r\n")); const char *value = skipWhitespace(strtok(nullptr, "\r\n"));
assert(*value != 0); assert(*value != 0);
char *end = strchr((char *)value + 1, *value); char *end = strchr((char *)value + 1, *value);
assert(end != nullptr);
*end = 0; *end = 0;
value += 1; value += 1;
const char *comment = skipWhitespace(strtok(end+1, "\r\n")); const char *comment = skipWhitespace(strtok(end+1, "\r\n"));