Skip to content

fpga-as: updated usage message and fixed non-returning error #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 25, 2025
Merged

fpga-as: updated usage message and fixed non-returning error #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99e0a2e
fpga-as: updated usage message and fixed non-returning error
lromor Apr 3, 2025
e51a102
Update fpga/assembler.cc
lromor Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions fpga/assembler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <sys/types.h>

#include <array>
#include <cerrno>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
Expand All @@ -21,7 +22,6 @@
#include "absl/status/status.h"
#include "absl/strings/match.h"
#include "absl/strings/numbers.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_split.h"
#include "fpga/database-parsers.h"
Expand Down Expand Up @@ -301,13 +301,12 @@ If not present, it must be provided via PRJXRAY_DB_PATH.)");
ABSL_FLAG(std::string, part, "", R"(FPGA part name, e.g. "xc7a35tcsg324-1".)");

static inline std::string Usage(std::string_view name) {
return absl::StrCat("usage: ", name,
" [options] < input.fasm > output.frm\n"
R"(
fpga parses a sequence of fasm lines and assembles them
into a set of frames to be mapped into bitstream.
Output is written to stdout.
)");
return absl::StrFormat(R"(usage: %s [options] < input.fasm > output.bit

This tool parses a sequence of fasm lines and assembles them
into a set of frames then mapped into bitstream.
Output is written to stdout.)",
name);
}

static std::string StatusToErrorMessage(std::string_view message,
Expand Down Expand Up @@ -380,6 +379,7 @@ int main(int argc, char *argv[]) {
const auto args_count = args.size();
if (args_count > 2) {
std::cerr << absl::ProgramUsageMessage() << '\n';
return 1;
}
const absl::StatusOr<std::string> prjxray_db_path_result =
GetOptFlagOrFromEnv(FLAGS_prjxray_db_path, "PRJXRAY_DB_PATH");
Expand Down Expand Up @@ -422,6 +422,11 @@ int main(int argc, char *argv[]) {
const std::string_view arg(args[1]);
if (arg != "-") {
input_stream = std::fopen(args[1], "r");
if (input_stream == nullptr) {
std::cerr << absl::ErrnoToStatus(errno, "cannot open fasm file")
<< "\n";
return 1;
}
}
}
fpga::Frames frames;
Expand Down