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

src/svf_jtag: cppcheck/lint

This commit is contained in:
Gwenhael Goavec-Merou 2022-11-06 18:33:43 +01:00
parent 0b0055495c
commit e595953546
2 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/svf_jtag.cpp
View File

@ -1,19 +1,23 @@
// SPDX-License-Identifier: Apache-2.0
/*
* Copyright (C) 2019 Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
* Copyright (C) 2019-2022 Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
* Copyright (C) 2022 phdussud
*
*/
#include "svf_jtag.hpp"
#include <unistd.h>
#include <algorithm>
#include <iostream>
#include <sstream>
#include <fstream>
#include <map>
#include <vector>
#include <unistd.h>
#include "jtag.hpp"
#include "svf_jtag.hpp"
using namespace std;
void SVF_jtag::split_str(string const &str, vector<string> &vparse)
@ -33,15 +37,16 @@ void SVF_jtag::clear_XYR(svf_XYR &t)
t.smask.clear();
}
static unsigned char *parse_hex(string const &in, size_t byte_length, bool default_value)
static unsigned char *parse_hex(string const &in, size_t byte_length,
bool default_value)
{
unsigned char *txbuf = new unsigned char[byte_length];
char c;
int last_iter = ((int)in.size() - (int)(2 * byte_length));
for (int i = (in.size() - 1), pos = 0; i >= last_iter; i--, pos++) {
if (i < 0)
size_t last_iter = in.size() - (2 * byte_length);
for (size_t i = (in.size() - 1), pos = 0; i >= last_iter; i--, pos++) {
if (i < 0) {
c = default_value ? 0x0f : 0x00;
else {
} else {
if (in[i] <= '9')
c = 0x0f & (in[i] - '0');
else
@ -83,7 +88,7 @@ void SVF_jtag::parse_XYR(vector<string> const &vstr, svf_XYR &t)
t.tdo.clear();
if (t.len == 0)
return;
for (long unsigned int pos = 2; pos < vstr.size(); pos++) {
for (size_t pos = 2; pos < vstr.size(); pos++) {
s = vstr[pos];
if (!s.compare("TDO")) {
@ -149,8 +154,9 @@ void SVF_jtag::parse_XYR(vector<string> const &vstr, svf_XYR &t)
if (!t.tdo.empty()) {
read_buffer = new unsigned char[byte_len];
read_buffer[byte_len - 1] = 0; // clear the last byte which may not be full;
} else
} else {
read_buffer = NULL;
}
if (write_data == 0)
_jtag->shiftIR(write_buffer, read_buffer, t.len, _endir);
else
@ -206,21 +212,18 @@ void SVF_jtag::parse_runtest(vector<string> const &vstr)
}
}
auto res = find(begin(vstr) + pos, end(vstr), "ENDSTATE");
if (res != end(vstr))
{
if (res != end(vstr)) {
res++;
end_state = fsm_state[*res];
}
if (run_state != -1)
{
if (run_state != -1) {
_run_state = run_state;
}
if (end_state != -1)
{
if (end_state != -1) {
_end_state = end_state;
}
else if (run_state != -1)
} else if (run_state != -1) {
_end_state = run_state;
}
_jtag->set_state(_run_state);
_jtag->toggleClk(nb_iter);
if (min_duration > 0) {
@ -398,5 +401,4 @@ void SVF_jtag::parse(string filename)
}
cout << "end of SVF file" << endl;
}

9
src/svf_jtag.hpp
View File

@ -1,11 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
/*
* Copyright (C) 2019 Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
* Copyright (C) 2019-2022 Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
*/
#ifndef SVF_JTAG_HPP
#define SVF_JTAG_HPP
#ifndef SRC_SVF_JTAG_HPP_
#define SRC_SVF_JTAG_HPP_
#include <iostream>
#include <string>
#include <vector>
#include <map>
@ -68,4 +69,4 @@ class SVF_jtag {
svf_XYR tdr;
svf_XYR tir;
};
#endif
#endif // SRC_SVF_JTAG_HPP_