mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 03:32:29 +00:00
Code Activity

Fixed various VS warnings

Browse source
This commit is contained in:
Clifford Wolf 2014-10-18 15:20:38 +02:00
parent 85572b05e5
commit 84ffe04075
8 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontends/ast/simplify.cc
View file

@ -2457,7 +2457,7 @@ AstNode *AstNode::eval_const_function(AstNode *fcall)
} }
log_assert(block != NULL); log_assert(block != NULL);
log_assert(variables.count(str)); log_assert(variables.count(str) != 0);
while (!block->children.empty()) while (!block->children.empty())
{ {

2
kernel/log.cc
View file

@ -64,7 +64,7 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
counter.QuadPart *= 1000000; counter.QuadPart *= 1000000;
counter.QuadPart /= freq.QuadPart; counter.QuadPart /= freq.QuadPart;
tv->tv_sec = counter.QuadPart / 1000000; tv->tv_sec = long(counter.QuadPart / 1000000);
tv->tv_usec = counter.QuadPart % 1000000; tv->tv_usec = counter.QuadPart % 1000000;
return 0; return 0;

4
kernel/rtlil.cc
View file

@ -1778,7 +1778,7 @@ const std::map<RTLIL::IdString, RTLIL::SigSpec> &RTLIL::Cell::connections() cons
bool RTLIL::Cell::hasParam(RTLIL::IdString paramname) const bool RTLIL::Cell::hasParam(RTLIL::IdString paramname) const
{ {
return parameters.count(paramname); return parameters.count(paramname) != 0;
} }
void RTLIL::Cell::unsetParam(RTLIL::IdString paramname) void RTLIL::Cell::unsetParam(RTLIL::IdString paramname)
@ -3041,7 +3041,7 @@ bool RTLIL::SigSpec::parse_rhs(const RTLIL::SigSpec &lhs, RTLIL::SigSpec &sig, R
if (lhs.chunks_.size() == 1) { if (lhs.chunks_.size() == 1) {
char *p = (char*)str.c_str(), *endptr; char *p = (char*)str.c_str(), *endptr;
long long int val = strtoll(p, &endptr, 10); long int val = strtol(p, &endptr, 10);
if (endptr && endptr != p && *endptr == 0) { if (endptr && endptr != p && *endptr == 0) {
sig = RTLIL::SigSpec(val, lhs.width_); sig = RTLIL::SigSpec(val, lhs.width_);
cover("kernel.rtlil.sigspec.parse.rhs_dec"); cover("kernel.rtlil.sigspec.parse.rhs_dec");

2
kernel/yosys.cc
View file

@ -231,7 +231,7 @@ std::string make_temp_file(std::string template_str)
while (1) { while (1) {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
static std::string y = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; static std::string y = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
static uint32_t x = 314159265 ^ time(NULL); static uint32_t x = 314159265 ^ uint32_t(time(NULL));
x ^= x << 13, x ^= x >> 17, x ^= x << 5; x ^= x << 13, x ^= x >> 17, x ^= x << 5;
template_str[pos+i] = y[x % y.size()]; template_str[pos+i] = y[x % y.size()];
} }

4
libs/ezsat/ezsat.cc
View file

@ -1118,7 +1118,7 @@ int64_t ezSAT::vec_model_get_signed(const std::vector<int> &modelExpressions, co
for (int i = 0; i < 64; i++) { for (int i = 0; i < 64; i++) {
int j = i < int(vec1.size()) ? i : vec1.size()-1; int j = i < int(vec1.size()) ? i : vec1.size()-1;
if (modelMap.at(vec1[j])) if (modelMap.at(vec1[j]))
value |= 1 << i; value |= int64_t(1) << i;
} }
return value; return value;
} }
@ -1132,7 +1132,7 @@ uint64_t ezSAT::vec_model_get_unsigned(const std::vector<int> &modelExpressions,
modelMap[modelExpressions[i]] = modelValues[i]; modelMap[modelExpressions[i]] = modelValues[i];
for (int i = 0; i < int(vec1.size()); i++) for (int i = 0; i < int(vec1.size()); i++)
if (modelMap.at(vec1[i])) if (modelMap.at(vec1[i]))
value |= 1 << i; value |= uint64_t(1) << i;
return value; return value;
} }

2
passes/opt/opt_clean.cc
View file

@ -112,7 +112,7 @@ bool compare_signals(RTLIL::SigBit &s1, RTLIL::SigBit &s2, SigPool &regs, SigPoo
if (regs.check_any(s1) != regs.check_any(s2)) if (regs.check_any(s1) != regs.check_any(s2))
return regs.check_any(s2); return regs.check_any(s2);
if (direct_wires.count(w1) != direct_wires.count(w2)) if (direct_wires.count(w1) != direct_wires.count(w2))
return direct_wires.count(w2); return direct_wires.count(w2) != 0;
if (conns.check_any(s1) != conns.check_any(s2)) if (conns.check_any(s1) != conns.check_any(s2))
return conns.check_any(s2); return conns.check_any(s2);
} }

4
passes/opt/share.cc
View file

@ -747,7 +747,7 @@ struct ShareWorker
forbidden_controls_cache[cell].insert(bits.begin(), bits.end()); forbidden_controls_cache[cell].insert(bits.begin(), bits.end());
} }
log_assert(recursion_state.count(cell)); log_assert(recursion_state.count(cell) != 0);
recursion_state.erase(cell); recursion_state.erase(cell);
return forbidden_controls_cache[cell]; return forbidden_controls_cache[cell];
@ -862,7 +862,7 @@ struct ShareWorker
activation_patterns_cache[cell].insert(c_patterns.begin(), c_patterns.end()); activation_patterns_cache[cell].insert(c_patterns.begin(), c_patterns.end());
} }
log_assert(recursion_state.count(cell)); log_assert(recursion_state.count(cell) != 0);
recursion_state.erase(cell); recursion_state.erase(cell);
optimize_activation_patterns(activation_patterns_cache[cell]); optimize_activation_patterns(activation_patterns_cache[cell]);

8
passes/techmap/dfflibmap.cc
View file

@ -108,7 +108,7 @@ static void find_cell(LibertyAst *ast, std::string cell_type, bool clkpol, bool
LibertyAst *best_cell = NULL; LibertyAst *best_cell = NULL;
std::map<std::string, char> best_cell_ports; std::map<std::string, char> best_cell_ports;
int best_cell_pins = 0; int best_cell_pins = 0;
float best_cell_area = 0; double best_cell_area = 0;
if (ast->id != "library") if (ast->id != "library")
log_error("Format error in liberty file.\n"); log_error("Format error in liberty file.\n");
@ -144,7 +144,7 @@ static void find_cell(LibertyAst *ast, std::string cell_type, bool clkpol, bool
this_cell_ports[cell_rst_pin] = 'R'; this_cell_ports[cell_rst_pin] = 'R';
this_cell_ports[cell_next_pin] = 'D'; this_cell_ports[cell_next_pin] = 'D';
float area = 0; double area = 0;
LibertyAst *ar = cell->find("area"); LibertyAst *ar = cell->find("area");
if (ar != NULL && !ar->value.empty()) if (ar != NULL && !ar->value.empty())
area = atof(ar->value.c_str()); area = atof(ar->value.c_str());
@ -204,7 +204,7 @@ static void find_cell_sr(LibertyAst *ast, std::string cell_type, bool clkpol, bo
LibertyAst *best_cell = NULL; LibertyAst *best_cell = NULL;
std::map<std::string, char> best_cell_ports; std::map<std::string, char> best_cell_ports;
int best_cell_pins = 0; int best_cell_pins = 0;
float best_cell_area = 0; double best_cell_area = 0;
if (ast->id != "library") if (ast->id != "library")
log_error("Format error in liberty file.\n"); log_error("Format error in liberty file.\n");
@ -236,7 +236,7 @@ static void find_cell_sr(LibertyAst *ast, std::string cell_type, bool clkpol, bo
this_cell_ports[cell_clr_pin] = 'R'; this_cell_ports[cell_clr_pin] = 'R';
this_cell_ports[cell_next_pin] = 'D'; this_cell_ports[cell_next_pin] = 'D';
float area = 0; double area = 0;
LibertyAst *ar = cell->find("area"); LibertyAst *ar = cell->find("area");
if (ar != NULL && !ar->value.empty()) if (ar != NULL && !ar->value.empty())
area = atof(ar->value.c_str()); area = atof(ar->value.c_str());