luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from trabucayre/bump_gflags_fix_build 

Bump gflags fix build
This commit is contained in:
Hans Baier 2026-03-24 23:02:55 +07:00 committed by GitHub
parent e87c79a156 b525bf9a3b
commit 132342f7a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -15,7 +15,7 @@
url = https://github.com/jbeder/yaml-cpp.git
[submodule "third_party/fasm"]
path = third_party/fasm
url = https://github.com/SymbiFlow/fasm.git
url = https://github.com/openxc7/fasm.git
[submodule "third_party/python-sdf-timing"]
path = third_party/python-sdf-timing
url = https://github.com/SymbiFlow/python-sdf-timing.git

1
lib/include/prjxray/memory_mapped_file.h
View File

@ -12,6 +12,7 @@
#include <memory>
#include <string>
#include <cstdint>
#include <absl/types/span.h>

2
third_party/fasm vendored

@ -1 +1 @@
Subproject commit ffafe821bae68637fe46e36bcfd2a01b97cdf6f2
Subproject commit 2f57ccb1727a120e8cacbb95c578f3c71bdcc95a

2
third_party/gflags vendored

@ -1 +1 @@
Subproject commit 03a4842c9c6aaef438d7bf0c84e8a62c8064992b
Subproject commit 33bb3461e10864b5406353d3a1fb7ff34c2314b8

16
tools/bitread.cc
View File

@ -67,9 +67,9 @@ uint32_t frame_range_begin = 0, frame_range_end = 0;
std::vector<uint32_t> zero_frame(101);
struct BitReader {
BitReader(const std::vector<uint8_t>& bytes) : bytes_(bytes) {}
BitReader(const absl::Span<uint8_t>& bytes) : bytes_(bytes) {}
const std::vector<uint8_t>& bytes_;
const absl::Span<uint8_t>& bytes_;
template <typename T>
int operator()(T& arg) {
@ -319,7 +319,7 @@ int main(int argc, char** argv) {
frame_range_end = strtol(p.second.c_str(), nullptr, 0) + 1;
}
std::vector<uint8_t> in_bytes;
absl::Span<uint8_t> in_bytes;
if (argc == 2) {
auto in_file_name = argv[1];
auto in_file =
@ -333,16 +333,18 @@ int main(int argc, char** argv) {
std::cout << "Bitstream size: " << in_file->size() << " bytes"
<< std::endl;
in_bytes = std::vector<uint8_t>(
static_cast<uint8_t*>(in_file->data()),
static_cast<uint8_t*>(in_file->data()) + in_file->size());
in_bytes = absl::Span<uint8_t>(
static_cast<uint8_t*>(in_file->data()), in_file->size());
} else {
std::vector<uint8_t> t;
while (1) {
int c = getchar();
if (c == EOF)
break;
in_bytes.push_back(c);
t.push_back(c);
}
in_bytes = absl::Span<uint8_t>(
static_cast<uint8_t*>(t.data()), t.size());
std::cout << "Bitstream size: " << in_bytes.size() << " bytes"
<< std::endl;