riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2141 from whitequark/cxxrtl-cxx11 

cxxrtl: various compiler compatibility fixes
This commit is contained in:
whitequark 2020-06-10 17:10:15 +00:00 committed by GitHub
parent 072b14f1a9 6021ff727d
commit 8a4841d786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backends/cxxrtl/cxxrtl.h
View File

@ -608,6 +608,7 @@ struct memory {
// This utterly reprehensible construct is the most reasonable way to apply a function to every element
// of a parameter pack, if the elements all have different types and so cannot be cast to an initializer list.
auto _ = {std::move(std::begin(init.data), std::end(init.data), data.begin() + init.offset)...};
(void)_;
}
// An operator for direct memory reads. May be used at any time during the simulation.
@ -676,10 +677,8 @@ struct metadata {
// In debug mode, using the wrong .as_*() function will assert.
// In release mode, using the wrong .as_*() function will safely return a default value.
union {
const unsigned uint_value = 0;
const signed sint_value;
};
const signed sint_value = 0;
const std::string string_value = "";
const double double_value = 0.0;
@ -826,7 +825,9 @@ struct module {
return deltas;
}
virtual void debug_info(debug_items &items, std::string path = "") {}
virtual void debug_info(debug_items &items, std::string path = "") {
(void)items, (void)path;
}
};
} // namespace cxxrtl

3
backends/cxxrtl/cxxrtl_backend.cc
View File

@ -1922,8 +1922,9 @@ struct CxxrtlWorker {
if (top_module != nullptr && debug_info) {
f << "cxxrtl_toplevel " << design_ns << "_create() {\n";
inc_indent();
std::string top_type = design_ns + "::" + mangle(top_module);
f << indent << "return new _cxxrtl_toplevel { ";
f << "std::make_unique<" << design_ns << "::" << mangle(top_module) << ">()";
f << "std::unique_ptr<" << top_type << ">(new " + top_type + ")";
f << " };\n";
dec_indent();
f << "}\n";