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

svf_jtag: fix incorrect handling of spaces and newlines

This commit is contained in:
aisuneko icecat 2026-05-06 23:04:11 +08:00
parent 212a025de8
commit 38acd7644c
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/svf_jtag.cpp
View File

@ -7,6 +7,7 @@
#include "svf_jtag.hpp" #include "svf_jtag.hpp"
#include <stdexcept>
#include <unistd.h> #include <unistd.h>
#include <algorithm> #include <algorithm>
@ -23,8 +24,11 @@ void SVF_jtag::split_str(std::string const &str, std::vector<std::string> &vpars
{ {
std::string token; std::string token;
std::istringstream tokenStream(str); std::istringstream tokenStream(str);
while (getline(tokenStream, token, ' ')) while (tokenStream >> token){
vparse.push_back(token); if(!token.empty()){
vparse.push_back(token);
}
}
} }
void SVF_jtag::clear_XYR(svf_XYR &t) void SVF_jtag::clear_XYR(svf_XYR &t)
@ -90,6 +94,11 @@ void SVF_jtag::parse_XYR(std::vector<std::string> const &vstr, svf_XYR &t)
for (size_t pos = 2; pos < vstr.size(); pos++) { for (size_t pos = 2; pos < vstr.size(); pos++) {
s = vstr[pos]; s = vstr[pos];
if (s.empty()){
throw std::runtime_error("Error parsing instruction: extraneous spaces");
return;
}
if (!s.compare("TDO")) { if (!s.compare("TDO")) {
mode = 1; mode = 1;
continue; continue;
@ -372,6 +381,9 @@ void SVF_jtag::parse(std::string filename)
unsigned int lineno = 0; unsigned int lineno = 0;
try { try {
while (getline(fs, str)) { while (getline(fs, str)) {
if(str.empty()){
continue;
}
/* sanity check: DOS CR */ /* sanity check: DOS CR */
if (str.back() == '\r') if (str.back() == '\r')
str.pop_back(); str.pop_back();