Index: trunk/IPs/systemC/Environment/Data/selftest/main.cpp =================================================================== --- trunk/IPs/systemC/Environment/Data/selftest/main.cpp (revision 134) +++ trunk/IPs/systemC/Environment/Data/selftest/main.cpp (revision 138) @@ -1,4 +1,8 @@ +#ifdef SYSTEMC +#include "systemc.h" +#endif #include #include "../include/Data.h" +#include "../../../shared/mapping_memory.h" using namespace std; @@ -29,168 +33,186 @@ { cout << "
Begin" << endl; - - { -// Segment * seg1 = new Segment (); + + const bool test1 = false; // + const bool test2 = true; // + + if (test1) + { + // Segment * seg1 = new Segment (); + + // TEST(seg1->getType (), TYPE_TARGET_MEMORY); + // TEST(seg1->getIndex (), 0); + // TEST(seg1->getBase (), 0); + // TEST(seg1->getSize (), 0); + // TEST(seg1->getUncached (), false); + + // seg1->define_target(TYPE_TARGET_SIM2OS,4); + // TEST(seg1->getType (), TYPE_TARGET_SIM2OS); + // TEST(seg1->getIndex (), 4); + + // cout << *seg1 << endl; -// TEST(seg1->getType (), TYPE_TARGET_MEMORY); -// TEST(seg1->getIndex (), 0); -// TEST(seg1->getBase (), 0); -// TEST(seg1->getSize (), 0); -// TEST(seg1->getUncached (), false); + SEGMENT_TABLE_ENTRY * entry = new SEGMENT_TABLE_ENTRY("entry", 0x100, 0x1024, 21, 7, true); -// seg1->define_target(TYPE_TARGET_SIM2OS,4); -// TEST(seg1->getType (), TYPE_TARGET_SIM2OS); -// TEST(seg1->getIndex (), 4); - -// cout << *seg1 << endl; - - SEGMENT_TABLE_ENTRY * entry = new SEGMENT_TABLE_ENTRY("entry", 0x100, 0x1024, 21, 7, true); - - Segment * seg2 = new Segment (entry); - - cout << *seg2 << endl; - - TEST(seg2->test(0x100, 0x0 ), true); - TEST(seg2->test(0x100, 0x1024), true); - TEST(seg2->test(0x100, 0x1025), false); - - char * str = new char [10]; - - str [0] = 'k'; - str [1] = 'a'; - str [2] = 'n'; - str [3] = 'e'; - str [4] = 'd'; - str [5] = 'e'; - str [6] = 'a'; - str [7] = 'd'; - - seg2->write(0x200,8,str); - - for (uint32_t i=0; i<10; i++) - str [i] = '.'; - - for (uint32_t i=0; i<10; i++) - cout << str [i]; - cout << endl; - - str [0] = 'i'; - str [1] = 's'; - str [2] = 'b'; - str [3] = 'a'; - str [4] = 'c'; - str [5] = 'k'; - - seg2->write(0x204,6,str); - - for (uint32_t i=0; i<10; i++) - str [i] = '.'; - - seg2->read(0x200,10,str); - - for (uint32_t i=0; i<10; i++) - cout << str [i]; - cout << endl; - - Entity * entity1 = new Entity (false); - Entity * entity2 = new Entity (true, seg2); - - cout << *entity1 << endl; - cout << *entity2 << endl; - - delete entity2; - delete entity1; - delete [] str; - delete seg2; - delete entry; -// delete seg1; - } - - { - SOCLIB_SEGMENT_TABLE * segtable = new SOCLIB_SEGMENT_TABLE; - segtable->setMSBNumber (8); - segtable->setDefaultTarget(0,0); - - //shared data segment - - const int TEXT_BASE = 0x0; - const int DATA_CACHED_BASE = 0x10000000; - const int DATA_UNCACHED_BASE = 0x40000000; - - const int TEXT_SIZE = 0x4000; - const int DATA_CACHED_SIZE = 0x4000; - const int DATA_UNCACHED_SIZE = 0x4000; - - // Add a segment :name , address of base , size , global index , local index, uncache - segtable->addSegment("text" , TEXT_BASE , TEXT_SIZE , 0 ,0 , false); - segtable->addSegment("data" , DATA_CACHED_BASE , DATA_CACHED_SIZE , 0 ,0 , false); - segtable->addSegment("data_unc" , DATA_UNCACHED_BASE , DATA_UNCACHED_SIZE , 0 ,0 , true ); - - segtable->print(); - - Parameters * param = new Parameters (16,0,0,segtable); - - Data * data = new Data ("my_data", param); - - cout << *data << endl; - - const char * filename = "selftest/data/soft.x"; - const char * sections_text [] = {".text",NULL}; - const char * sections_data [] = {".data",".rodata",".bss",".sdata",".sbss", NULL}; - - data->init("text" , filename, sections_text); - data->init("data" , filename, sections_data); - - char * str = new char [8]; - - data->read(0x100,8,str); - - cout << hex; - for (uint32_t i=0; i<8; i++) - { - if (i==4) - cout << endl; - cout << std::setw(2) << std::setfill('0') << ((static_cast(str [i]))&0xff); - } - cout << dec << endl; - - str [0] = 0xde; - str [1] = 0xad; - str [2] = 0xbe; - str [3] = 0xef; - str [4] = 0xba; - str [5] = 0xbe; - str [6] = 0xbe; - str [7] = 0xef; - - data->write(0x104,8,str); - - data->read(0x100,8,str); - - cout << hex; - for (uint32_t i=0; i<8; i++) - { - if (i==4) - cout << endl; - cout << std::setw(2) << std::setfill('0') << ((static_cast(str [i]))&0xff); - } - cout << dec << endl; - - data->read(0x108,8,str); - - cout << hex; - for (uint32_t i=0; i<8; i++) - { - if (i==4) - cout << endl; - cout << std::setw(2) << std::setfill('0') << ((static_cast(str [i]))&0xff); - } - cout << dec << endl; - - delete [] str; - delete data; - delete param; - delete segtable; - } + Segment * seg2 = new Segment (entry); + + cout << *seg2 << endl; + + TEST(seg2->test(0x100, 0x0 ), true); + TEST(seg2->test(0x100, 0x1024), true); + TEST(seg2->test(0x100, 0x1025), false); + + char * str = new char [10]; + + str [0] = 'k'; + str [1] = 'a'; + str [2] = 'n'; + str [3] = 'e'; + str [4] = 'd'; + str [5] = 'e'; + str [6] = 'a'; + str [7] = 'd'; + + seg2->write(0x200,8,str); + + for (uint32_t i=0; i<10; i++) + str [i] = '.'; + + for (uint32_t i=0; i<10; i++) + cout << str [i]; + cout << endl; + + str [0] = 'i'; + str [1] = 's'; + str [2] = 'b'; + str [3] = 'a'; + str [4] = 'c'; + str [5] = 'k'; + + seg2->write(0x204,6,str); + + for (uint32_t i=0; i<10; i++) + str [i] = '.'; + + seg2->read(0x200,10,str); + + for (uint32_t i=0; i<10; i++) + cout << str [i]; + cout << endl; + + Entity * entity1 = new Entity (false); + Entity * entity2 = new Entity (true, seg2); + + cout << *entity1 << endl; + cout << *entity2 << endl; + + delete entity2; + delete entity1; + delete [] str; + delete seg2; + delete entry; +// delete seg1; + } + + if (test2) + { + SOCLIB_SEGMENT_TABLE * segtable = new SOCLIB_SEGMENT_TABLE; + segtable->setMSBNumber (8); + segtable->setDefaultTarget(0,0); + + //shared data segment + + // const int TEXT_BASE = 0x0; + // const int DATA_CACHED_BASE = 0x10000000; + // const int DATA_STACK_BASE = 0x40000000; + // const int DATA_UNCACHED_BASE = 0x80000000; + + // const int TEXT_SIZE = 0x4000; + // const int DATA_CACHED_SIZE = 0x4000; + // const int DATA_STACK_SIZE = 0x4000; + // const int DATA_UNCACHED_SIZE = 0x4000; + + // Add a segment name , address of base , size , global index , local index, uncache + segtable->addSegment("text" , TEXT_BASE , TEXT_SIZE , 0 , 0 , false); + segtable->addSegment("data" , DATA_CACHED_BASE , DATA_CACHED_SIZE , 0 , 0 , false); + // segtable->addSegment("data_stack", DATA_STACK_BASE , DATA_STACK_SIZE , 0 , 0 , false); + // segtable->addSegment("data_unc" , DATA_UNCACHED_BASE , DATA_UNCACHED_SIZE , 0 , 0 , true ); + + segtable->print(); + + Parameters * param = new Parameters (16,0,0,segtable); + + Data * data = new Data ("my_data", param); + + cout << *data << endl; + + // const char * filename = "selftest/data/soft.x"; + const char * filename = "../../../../Softwares/Test/Test_000/bin/soft_NEWLIB_MORPHEO.x"; + const char * sections_text [] = {".text",NULL}; + const char * sections_data [] = {".data",".rodata",".bss",".sdata",".sbss", NULL}; + + bool init_ok = true; + init_ok = init_ok and data->init("text" , filename, sections_text); + init_ok = init_ok and data->init("data" , filename, sections_data); + + if (init_ok) + { + char * str = new char [8]; + + data->read(0x100,8,str); + + cout << "Read @100 : " << hex << "0x"; + for (uint32_t i=0; i<8; i++) + { + if (i==4) + cout << endl << "Read @104 : 0x"; + cout << std::setw(2) << std::setfill('0') << ((static_cast(str [i]))&0xff); + } + cout << dec << endl; + + str [0] = 0xde; + str [1] = 0xad; + str [2] = 0xbe; + str [3] = 0xef; + str [4] = 0xba; + str [5] = 0xbe; + str [6] = 0xbe; + str [7] = 0xef; + + cout << "Write @104 : 0xdeadbeef" << endl; + cout << "Write @108 : 0xbabebeef" << endl; + + data->write(0x104,8,str); + + data->read(0x100,8,str); + + cout << "Read @100 : " << hex << "0x"; + for (uint32_t i=0; i<8; i++) + { + if (i==4) + cout << endl << "Read @104 : 0x"; + cout << std::setw(2) << std::setfill('0') << ((static_cast(str [i]))&0xff); + } + cout << dec << endl; + + data->read(0x108,8,str); + + cout << "Read @108 : " << hex << "0x"; + for (uint32_t i=0; i<8; i++) + { + if (i==4) + cout << endl << "Read @10C : 0x"; + cout << std::setw(2) << std::setfill('0') << ((static_cast(str [i]))&0xff); + } + cout << dec << endl; + + delete [] str; + } + + delete data; + delete param; + delete segtable; + } + cout << "
End" << endl; Index: trunk/IPs/systemC/Environment/Data/src/Segment_init.cpp =================================================================== --- trunk/IPs/systemC/Environment/Data/src/Segment_init.cpp (revision 134) +++ trunk/IPs/systemC/Environment/Data/src/Segment_init.cpp (revision 138) @@ -9,10 +9,13 @@ void * ptab; int size = this->size; +// int size = 0; int offset = 0; loadexec(&ptab,&size,&offset,filename,sections); -// std::cout << " - size : " << size << std::endl; -// std::cout << " - offset : " << offset << std::endl; + // std::cout << " - name : " << name << std::endl; + // std::cout << " - size : " << size << std::endl; + // std::cout << " - size : " << this->size << std::endl; + // std::cout << " - offset : " << offset << std::endl; if (size > (int)this->size) @@ -25,5 +28,4 @@ free (ptab); - // { Index: trunk/IPs/systemC/Environment/Data/src/loadexec.c =================================================================== --- trunk/IPs/systemC/Environment/Data/src/loadexec.c (revision 134) +++ trunk/IPs/systemC/Environment/Data/src/loadexec.c (revision 138) @@ -73,9 +73,23 @@ return; - if ((sect->flags & SEC_LOAD) && !(sect->flags & SEC_IN_MEMORY)) { - bfd_get_section_contents(exec, sect, - rinfo->mem + (sect->lma - rinfo->ladr), - 0, bfd_section_size(exec, sect)); - sect->contents = rinfo->mem; + if ((sect->flags & SEC_LOAD) && !(sect->flags & SEC_IN_MEMORY)) + { +/* #if 1 */ +/* printf(" * bindsection : \n"); */ +/* printf(" * exec : %x\n",(int)exec); */ +/* printf(" * sect : %x\n",(int)sect); */ +/* printf(" * size : %d\n",(int)(rinfo->mem + (sect->lma - rinfo->ladr))); */ +/* printf(" * mem : %d\n",(int)rinfo->mem); */ +/* printf(" * lma : %d\n",(int)sect->lma); */ +/* printf(" * ladr : %d\n",(int)rinfo->ladr); */ +/* fflush(stdout); */ +/* #endif */ + + bfd_get_section_contents(exec, + sect, + rinfo->mem + (sect->lma - rinfo->ladr), + 0, + bfd_section_size(exec, sect)); + sect->contents = rinfo->mem; } } @@ -92,13 +106,27 @@ return; +/* #if 1 */ +/* printf(" * sectionsize : \n"); */ +/* printf(" * name : %s\n",rinfo->sections[i]); */ +/* printf(" * size (before): %d (%x)\n",rinfo->size,rinfo->size); */ +/* printf(" * ladr (before): %d (%x)\n",rinfo->ladr,rinfo->ladr); */ +/* printf(" * hadr (before): %d (%x)\n",rinfo->hadr,rinfo->hadr); */ +/* #endif */ + rinfo->size += bfd_section_size(exec, sect); rinfo->ladr = sect->lma < rinfo->ladr ? sect->lma : rinfo->ladr; rinfo->hadr = sect->lma + rinfo->size > rinfo->hadr ? sect->lma + rinfo->size : rinfo->hadr; + +/* #if 1 */ +/* printf(" * size (after ): %d (%x)\n",rinfo->size,rinfo->size); */ +/* printf(" * ladr (after ): %d (%x)\n",rinfo->ladr,rinfo->ladr); */ +/* printf(" * hadr (after ): %d (%x)\n",rinfo->hadr,rinfo->hadr); */ +/* #endif */ + } void loadexec(void **emem, int *esize, int *eoffset, const char *file, const char **sections) { - bfd *exec; static int x; raminfo ringo; @@ -107,5 +135,5 @@ bfd_init(); - exec = bfd_openr(file, NULL); + bfd * exec = bfd_openr(file, NULL); if (!exec) { @@ -120,12 +148,15 @@ } -#if 0 - cout("Loading sections "); - for (i = 0; sections[i]; i++) - __cout("%s%s", sections[i], ((sections[i+1]!=NULL)?", ":" ")); - __cout("from \"%s\"\n",bfd_get_filename(exec)); - //cout("of executable '%s' for '%s' architecture in format '%s'\n", - // bfd_get_filename(exec), bfd_printable_name(exec), exec->xvec->name); -#endif +/* #if 1 */ +/* printf(" * Loading sections from \"%s\" :\n",bfd_get_filename(exec)); */ +/* { */ +/* int i; */ +/* for (i = 0; sections[i]; i++) */ +/* printf(" * %s\n", sections[i]); */ +/* } */ + +/* //cout("of executable '%s' for '%s' architecture in format '%s'\n", */ +/* // bfd_get_filename(exec), bfd_printable_name(exec), exec->xvec->name); */ +/* #endif */ /* Set input parameters to bindsection */ @@ -135,5 +166,16 @@ ringo.ladr = ~0; ringo.hadr = 0; + ringo.mem = NULL; + bfd_map_over_sections(exec, sectionssize, &ringo); + +/* #if 1 */ +/* printf(" * Meminfo : \n"); */ +/* printf(" * size : %d (%x)\n",ringo.size,ringo.size); */ +/* printf(" * esize : %d (%x)\n",*esize,*esize); */ +/* printf(" * ladr : %d (%x)\n",ringo.ladr,ringo.ladr); */ +/* printf(" * hadr : %d (%x)\n",ringo.hadr,ringo.hadr); */ +/* #endif */ + /* Get output parameters from sectionssize */ if (ringo.size < ringo.hadr - ringo.ladr) @@ -146,5 +188,7 @@ /* Start over again from the start of the memory */ - bfd_map_over_sections(exec, bindsection, &ringo); + bfd_map_over_sections(exec, + bindsection, + &ringo); /* Get output parameters from bindsection */