diff --git a/src/R2Architecture.cpp b/src/R2Architecture.cpp index c0004418..96d438da 100644 --- a/src/R2Architecture.cpp +++ b/src/R2Architecture.cpp @@ -241,10 +241,10 @@ ProtoModel *R2Architecture::buildProtoModelFromR2CC(const char *cc) { if (contained) { continue; // subregisters ride with their container } - child (e.second? killed: unaffected, "range", { + child (e.second? killed: unaffected, "addr", { { "space", e.first->space->getName () }, - { "first", hex (e.first->offset) }, - { "last", hex (e.first->offset + e.first->size - 1) } + { "offset", hex (e.first->offset) }, + { "size", std::to_string (e.first->size) } }); } } diff --git a/test/db/extras/ghidra_types b/test/db/extras/ghidra_types index b6ca36a5..ee738457 100644 --- a/test/db/extras/ghidra_types +++ b/test/db/extras/ghidra_types @@ -64,7 +64,7 @@ NAME=function variable annotations FILE=bins/dectest64 EXPECT=<