ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-06-21 08:29:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore privacy

Browse Source 
Moved field offset calculations for inherited classes to when the inherited
classes are processed.  This removes the need to have to remember if fields
were inherited or not, the offset already reflects the correct offset.

refs #218
This commit is contained in:
Alex Lin
2016-04-06 12:06:14 -05:00
parent 7dcc65d0bd
commit 4dad11bf45
11 changed files with 46 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp
View File

@ -16,15 +16,11 @@
FieldDescription::FieldDescription(
std::string in_container_class ,
bool in_inherited ,
bool in_virtual_inherited ,
unsigned int in_base_class_offset) :
bool in_inherited ) :
container_class(in_container_class) ,
base_class_offset(in_base_class_offset) ,
field_offset(0) ,
field_width(0) ,
inherited(in_inherited) ,
virtual_inherited(in_virtual_inherited) ,
units("--") ,
line_no(0) ,
io(3) ,
@ -247,12 +243,11 @@ void FieldDescription::setContainerClass(std::string in_name ) {
container_class = in_name ;
}
unsigned int FieldDescription::getBaseClassOffset() {
return base_class_offset ;
}
void FieldDescription::setFieldOffset(unsigned int in_offset) {
field_offset = in_offset ;
if ( is_bitfield ) {
calcBitfieldOffset() ;
}
}
unsigned int FieldDescription::getFieldOffset() {
@ -322,10 +317,6 @@ bool FieldDescription::isInherited() {
return inherited ;
}
bool FieldDescription::isVirtualInherited() {
return virtual_inherited ;
}
void FieldDescription::setAccess( clang::AccessSpecifier in_val ) {
access = in_val ;
}
@ -334,6 +325,19 @@ clang::AccessSpecifier FieldDescription::getAccess() {
return access ;
}
void FieldDescription::calcBitfieldOffset() {
unsigned int field_offset_bits = field_offset * 8 ;
bitfield_start_bit = 32 - (field_offset_bits % 32) - bitfield_width ;
bitfield_word_offset = (field_offset_bits / 32) * 4 ;
}
void FieldDescription::addOffset( unsigned int offset ) {
field_offset += offset ;
if ( is_bitfield ) {
calcBitfieldOffset() ;
}
}
void FieldDescription::setEnumString(std::string in_str) {
type_enum_string = in_str ;
}
@ -354,14 +358,6 @@ void FieldDescription::setBitFieldWidth(unsigned int len) {
bitfield_width = len ;
}
void FieldDescription::setBitFieldStart(unsigned int sb) {
bitfield_start_bit = sb ;
}
void FieldDescription::setBitFieldByteOffset(unsigned int wo) {
bitfield_word_offset = wo ;
}
unsigned int FieldDescription::getBitFieldWidth() {
return bitfield_width ;
}