luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vvp: get_word_index() & get_word_parent() moved to __vpiArrayWord.

This commit is contained in:
Maciej Suminski 2014-11-19 16:14:57 +01:00
parent c1164dcc33
commit 48d3701c02
3 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vvp/array.cc
View File

@ -376,7 +376,7 @@ int __vpiArrayWord::as_word_t::vpi_get(int code)
{ {
struct __vpiArrayWord*obj = array_var_word_from_handle(this); struct __vpiArrayWord*obj = array_var_word_from_handle(this);
assert(obj); assert(obj);
struct __vpiArrayBase*parent = get_word_parent(obj); struct __vpiArrayBase*parent = obj->get_parent();
switch (code) { switch (code) {
case vpiLineNo: case vpiLineNo:
@ -409,8 +409,8 @@ char* __vpiArrayWord::as_word_t::vpi_get_str(int code)
{ {
struct __vpiArrayWord*obj = array_var_word_from_handle(this); struct __vpiArrayWord*obj = array_var_word_from_handle(this);
assert(obj); assert(obj);
struct __vpiArray*parent = (__vpiArray*) get_word_parent(obj); struct __vpiArray*parent = (__vpiArray*) obj->get_parent();
unsigned index = get_word_index(obj); unsigned index = obj->get_index();
if (code == vpiFile) { // Not implemented for now! if (code == vpiFile) { // Not implemented for now!
return simple_set_rbuf_str(file_names[0]); return simple_set_rbuf_str(file_names[0]);
@ -425,8 +425,8 @@ void __vpiArrayWord::as_word_t::vpi_get_value(p_vpi_value vp)
{ {
struct __vpiArrayWord*obj = array_var_word_from_handle(this); struct __vpiArrayWord*obj = array_var_word_from_handle(this);
assert(obj); assert(obj);
struct __vpiArray*parent = (__vpiArray*) get_word_parent(obj); struct __vpiArray*parent = (__vpiArray*) obj->get_parent();
unsigned index = get_word_index(obj); unsigned index = obj->get_index();
// Determine the appropriate format (The Verilog PLI Handbook 5.2.10) // Determine the appropriate format (The Verilog PLI Handbook 5.2.10)
if(vp->format == vpiObjTypeVal) { if(vp->format == vpiObjTypeVal) {
@ -481,8 +481,8 @@ vpiHandle __vpiArrayWord::as_word_t::vpi_put_value(p_vpi_value vp, int)
{ {
struct __vpiArrayWord*obj = array_var_word_from_handle(this); struct __vpiArrayWord*obj = array_var_word_from_handle(this);
assert(obj); assert(obj);
struct __vpiArray*parent = (__vpiArray*) get_word_parent(obj); struct __vpiArray*parent = (__vpiArray*) obj->get_parent();
unsigned index = get_word_index(obj); unsigned index = obj->get_index();
vvp_vector4_t val = vec4_from_vpi_value(vp, parent->vals_width); vvp_vector4_t val = vec4_from_vpi_value(vp, parent->vals_width);
array_set_word(parent, index, 0, val); array_set_word(parent, index, 0, val);
@ -493,7 +493,7 @@ vpiHandle __vpiArrayWord::as_word_t::vpi_handle(int code)
{ {
struct __vpiArrayWord*obj = array_var_word_from_handle(this); struct __vpiArrayWord*obj = array_var_word_from_handle(this);
assert(obj); assert(obj);
struct __vpiArray*parent = (__vpiArray*) get_word_parent(obj); struct __vpiArray*parent = (__vpiArray*) obj->get_parent();
switch (code) { switch (code) {
@ -523,7 +523,7 @@ void __vpiArrayWord::as_index_t::vpi_get_value(p_vpi_value vp)
{ {
struct __vpiArrayWord*obj = array_var_index_from_handle(this); struct __vpiArrayWord*obj = array_var_index_from_handle(this);
assert(obj); assert(obj);
unsigned index = get_word_index(obj); unsigned index = obj->get_index();
assert(vp->format == vpiIntVal); assert(vp->format == vpiIntVal);
vp->value.integer = index; vp->value.integer = index;
@ -1657,8 +1657,8 @@ value_callback*vpip_array_word_change(p_cb_data data)
struct __vpiArray*parent = 0; struct __vpiArray*parent = 0;
array_word_value_callback*cbh = 0; array_word_value_callback*cbh = 0;
if (struct __vpiArrayWord*word = array_var_word_from_handle(data->obj)) { if (struct __vpiArrayWord*word = array_var_word_from_handle(data->obj)) {
parent = (__vpiArray*) get_word_parent(word); parent = (__vpiArray*) word->get_parent();
unsigned addr = get_word_index(word); unsigned addr = word->get_index();
cbh = new array_word_value_callback(data); cbh = new array_word_value_callback(data);
cbh->word_addr = addr; cbh->word_addr = addr;

13
vvp/array_common.cc
View File

@ -119,19 +119,6 @@ static int array_index_free_object(vpiHandle ref)
__vpiHandle::free_object_fun_t __vpiArrayIndex::free_object_fun(void) __vpiHandle::free_object_fun_t __vpiArrayIndex::free_object_fun(void)
{ return &array_index_free_object; } { return &array_index_free_object; }
// TODO orson it should be a method
unsigned get_word_index(struct __vpiArrayWord*word)
{
return word - word->word0;
}
// TODO orson it should be a method
struct __vpiArrayBase*get_word_parent(struct __vpiArrayWord*word)
{
struct __vpiArrayWord*word0 = word->word0;
return (word0 - 1)->parent;
}
struct __vpiArrayWord*array_var_word_from_handle(vpiHandle ref) struct __vpiArrayWord*array_var_word_from_handle(vpiHandle ref)
{ {
if (ref == 0) if (ref == 0)

6
vvp/array_common.h
View File

@ -87,10 +87,10 @@ struct __vpiArrayWord {
struct __vpiArrayBase*parent; struct __vpiArrayBase*parent;
struct __vpiArrayWord*word0; struct __vpiArrayWord*word0;
}; };
};
unsigned get_word_index(struct __vpiArrayWord*word); inline unsigned get_index() const { return this - word0; }
struct __vpiArrayBase*get_word_parent(struct __vpiArrayWord*word); inline struct __vpiArrayBase*get_parent() const { return (word0 - 1)->parent; }
};
struct __vpiArrayWord*array_var_word_from_handle(vpiHandle ref); struct __vpiArrayWord*array_var_word_from_handle(vpiHandle ref);
struct __vpiArrayWord*array_var_index_from_handle(vpiHandle ref); struct __vpiArrayWord*array_var_index_from_handle(vpiHandle ref);