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

bitread: Refactor AUX data extraction 

Signed-off-by: Tomasz Michalak <tmichalak@antmicro.com>
This commit is contained in:
Tomasz Michalak 2020-12-01 15:47:54 +01:00
parent e7826ee117
commit a3ca052ccf
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/include/prjxray/xilinx/bitstream_reader.h
View File

@ -98,21 +98,19 @@ void BitstreamReader<ArchType>::PrintFpgaConfigurationLogicData(
// Get the data before the first FDRI_WRITE command packet // Get the data before the first FDRI_WRITE command packet
const auto fpga_conf_end = std::search( const auto fpga_conf_end = std::search(
words_.cbegin(), words_.cend(), kWcfgCmd.cbegin(), kWcfgCmd.cend()); words_.cbegin(), words_.cend(), kWcfgCmd.cbegin(), kWcfgCmd.cend());
fprintf(aux_fp, "FPGA configuration logic prefix: "); fprintf(aux_fp, "FPGA configuration logic prefix:");
for (auto it = words_.cbegin(); it != fpga_conf_end; ++it) { for (auto it = words_.cbegin(); it != fpga_conf_end; ++it) {
fprintf(aux_fp, "%08X ", *it); fprintf(aux_fp, " %08X", *it);
} }
fseek(aux_fp, -1, SEEK_CUR);
fprintf(aux_fp, "\n"); fprintf(aux_fp, "\n");
// Get the data after the last Null Command packet // Get the data after the last Null Command packet
const auto last_null_cmd = std::find_end( const auto last_null_cmd = std::find_end(
words_.cbegin(), words_.cend(), kNullCmd.cbegin(), kNullCmd.cend()); words_.cbegin(), words_.cend(), kNullCmd.cbegin(), kNullCmd.cend());
fprintf(aux_fp, "FPGA configuration logic suffix: "); fprintf(aux_fp, "FPGA configuration logic suffix:");
for (auto it = last_null_cmd; it != words_.cend(); ++it) { for (auto it = last_null_cmd; it != words_.cend(); ++it) {
fprintf(aux_fp, "%08X ", *it); fprintf(aux_fp, " %08X", *it);
} }
fseek(aux_fp, -1, SEEK_CUR);
fprintf(aux_fp, "\n"); fprintf(aux_fp, "\n");
} }
@ -132,11 +130,10 @@ void BitstreamReader<ArchType>::PrintHeader(T bitstream, FILE* aux_fp) {
auto header_packets = auto header_packets =
bitstream_span.subspan(0, sync_pos - bitstream.begin()); bitstream_span.subspan(0, sync_pos - bitstream.begin());
fprintf(aux_fp, "Header bytes: "); fprintf(aux_fp, "Header bytes:");
for (auto& word : header_packets) { for (auto& word : header_packets) {
fprintf(aux_fp, "%02X ", word); fprintf(aux_fp, " %02X", word);
} }
fseek(aux_fp, -1, SEEK_CUR);
fprintf(aux_fp, "\n"); fprintf(aux_fp, "\n");
} }