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

Merge pull request #1694 from rqou/json_compat_fix 

json: Change compat mode to directly emit ints <= 32 bits
This commit is contained in:
Claire Wolf 2020-02-13 18:30:22 +01:00 committed by GitHub
parent e069259a53 20ce4118da
commit cb7bc6a12f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backends/json/json.cc
View File

@ -104,7 +104,7 @@ struct JsonWriter
if (state < 2) if (state < 2)
str += " "; str += " ";
f << get_string(str); f << get_string(str);
} else if (compat_int_mode && GetSize(value) == 32 && value.is_fully_def()) { } else if (compat_int_mode && GetSize(value) <= 32 && value.is_fully_def()) {
if ((value.flags & RTLIL::ConstFlags::CONST_FLAG_SIGNED) != 0) if ((value.flags & RTLIL::ConstFlags::CONST_FLAG_SIGNED) != 0)
f << stringf("%d", value.as_int()); f << stringf("%d", value.as_int());
else else
@ -296,7 +296,7 @@ struct JsonBackend : public Backend {
log(" include AIG models for the different gate types\n"); log(" include AIG models for the different gate types\n");
log("\n"); log("\n");
log(" -compat-int\n"); log(" -compat-int\n");
log(" emit 32-bit fully-defined parameter values directly\n"); log(" emit 32-bit or smaller fully-defined parameter values directly\n");
log(" as JSON numbers (for compatibility with old parsers)\n"); log(" as JSON numbers (for compatibility with old parsers)\n");
log("\n"); log("\n");
log("\n"); log("\n");
@ -540,7 +540,7 @@ struct JsonPass : public Pass {
log(" also include AIG models for the different gate types\n"); log(" also include AIG models for the different gate types\n");
log("\n"); log("\n");
log(" -compat-int\n"); log(" -compat-int\n");
log(" emit 32-bit fully-defined parameter values directly\n"); log(" emit 32-bit or smaller fully-defined parameter values directly\n");
log(" as JSON numbers (for compatibility with old parsers)\n"); log(" as JSON numbers (for compatibility with old parsers)\n");
log("\n"); log("\n");
log("See 'help write_json' for a description of the JSON format used.\n"); log("See 'help write_json' for a description of the JSON format used.\n");