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

Fix frame_address_decoder using invalid memory. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2018-11-21 16:13:49 -08:00
parent 80974b5ba0
commit a5fa9fcefd
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
third_party/fasm vendored

@ -1 +1 @@
Subproject commit f78c27ecc34236df3cd4c845c13bdf279d30608c
Subproject commit b7a578552669954050f3700ced243b9d9e12d649

22
tools/frame_address_decoder.cc
View File

@ -6,15 +6,7 @@
namespace xc7series = prjxray::xilinx::xc7series;
int main(int argc, char* argv[]) {
std::istream* input_stream = &std::cin;
if (argc > 1) {
auto file_stream = std::ifstream(argv[1]);
if (file_stream) {
input_stream = &file_stream;
}
}
void frame_address_decode(std::istream * input_stream) {
for (uint32_t frame_address_raw;
(*input_stream) >> std::setbase(0) >> frame_address_raw;) {
xc7series::FrameAddress frame_address(frame_address_raw);
@ -31,6 +23,18 @@ int main(int argc, char* argv[]) {
<< " Type=" << frame_address.block_type()
<< std::endl;
}
}
int main(int argc, char* argv[]) {
if (argc > 1) {
std::ifstream file_stream(argv[1]);
if (file_stream) {
frame_address_decode(&file_stream);
return 0;
}
}
frame_address_decode(&std::cin);
return 0;
}