Changeset 88 for trunk/IPs/systemC/Environment/Sim2OS/src

Timestamp:

Dec 10, 2008, 7:31:39 PM (16 years ago)

Author:

rosiere

Message:

Almost complete design
with Test and test platform

Location:

trunk/IPs/systemC/Environment/Sim2OS/src

Files:

• Sim2OS_convert_address.cpp (modified) (1 diff)
• Sim2OS_parameter.cpp (modified) (1 diff)
• Sim2OS_service_clock.cpp (modified) (1 diff)
• Sim2OS_service_close.cpp (modified) (2 diffs)
• Sim2OS_service_lseek.cpp (modified) (2 diffs)
• Sim2OS_service_open.cpp (modified) (2 diffs)
• Sim2OS_service_read.cpp (modified) (2 diffs)
• Sim2OS_service_time.cpp (modified) (1 diff)
• Sim2OS_service_write.cpp (modified) (2 diffs)

trunk/IPs/systemC/Environment/Sim2OS/src/Sim2OS_convert_address.cpp

@@ -9 +9 @@
   void * Sim2OS::convert_address (void * address)
   {
-    void * result = param->segment_table->getAddrAlloc((uint32_t)address);
+    void * result = param->segment_table->getAddrAlloc(static_cast<uint32_t>(reinterpret_cast<uint64_t>(address)));
     
     if (result == NULL)
       {
-        std::cerr << "<" << name << "> address don't match : " << std::hex << (uint32_t)(address) << std::dec << std::endl;
+        std::cerr << "<" << name << "> address don't match : " << std::hex << static_cast<uint32_t>(reinterpret_cast<uint64_t>(address)) << std::dec << std::endl;
         exit(0);
       }

trunk/IPs/systemC/Environment/Sim2OS/src/Sim2OS_parameter.cpp

@@ -13 +13 @@
     {
       if (num_reg == 0)
-        num_service = int2service((int)(val));
+        num_service = int2service(static_cast<int32_t>(reinterpret_cast<int64_t>(val)));
       else
         arguments[num_reg] = val;

trunk/IPs/systemC/Environment/Sim2OS/src/Sim2OS_service_clock.cpp

@@ -16 +16 @@
     
     std::cout << "\n\t***** service : clock         *****" << std::endl;
-    std::cout << "\tresult    : " << (unsigned int) result << std::endl;
-    std::cout << "\terrno     : " << (unsigned int) error  << std::endl;
+    std::cout << "\tresult    : " << static_cast<int32_t>(reinterpret_cast<int64_t>(result)) << std::endl;
+    std::cout << "\terrno     : " << error << std::endl;
     
     return      result;

trunk/IPs/systemC/Environment/Sim2OS/src/Sim2OS_service_close.cpp

@@ -12 +12 @@
       }
     
-    int    fd     = (int)    arguments[1];
+    int    fd     = static_cast<int>(reinterpret_cast<int64_t>(arguments[1]));
     void * result = (void *) close(fd);
     error         = errno;
@@ -18 +18 @@
     std::cout << "\n\t***** service : close         *****" << std::endl;
     std::cout << "\tfd        : " << (unsigned int) fd     << std::endl;
-    std::cout << "\tresult    : " << (unsigned int) result << std::endl;
+    std::cout << "\tresult    : " << static_cast<int32_t>(reinterpret_cast<int64_t>(result)) << std::endl;
     std::cout << "\terrno     : " << (unsigned int) error  << std::endl;
     

trunk/IPs/systemC/Environment/Sim2OS/src/Sim2OS_service_lseek.cpp

@@ -12 +12 @@
       }
     
-    int    flides   = (int)    arguments[1];
-    off_t  offset   = (off_t)  arguments[2];
-    int    whence   = (int)    arguments[3];
+    int    flides   = static_cast<int  >(reinterpret_cast<int64_t>(arguments[1]));
+    off_t  offset   = static_cast<off_t>(reinterpret_cast<int64_t>(arguments[2]));
+    int    whence   = static_cast<int  >(reinterpret_cast<int64_t>(arguments[3]));
     void * result   = (void *) lseek(flides,offset,whence);
     error           = errno;
@@ -24 +24 @@
     std::cout << "\toffset    : " << (unsigned int) offset << std::endl;
     std::cout << "\twhence    : " << (unsigned int) whence << std::endl;
-    std::cout << "\tresult    : " << (unsigned int) result << std::endl;
+    std::cout << "\tresult    : " << static_cast<int32_t>(reinterpret_cast<int64_t>(result)) << std::endl;
     std::cout << "\terrno     : " << (unsigned int) error  << std::endl;
     

trunk/IPs/systemC/Environment/Sim2OS/src/Sim2OS_service_open.cpp

@@ -13 +13 @@
     
     const char *pathname = (const char *) convert_address(arguments[1]);
-    int         flags    = (int)          arguments[2];
-    mode_t      mode     = (mode_t)       arguments[3];
+    int         flags    = static_cast<int   >(reinterpret_cast<int64_t>(arguments[2]));
+    mode_t      mode     = static_cast<mode_t>(reinterpret_cast<int64_t>(arguments[3]));
     void *      result   = (void *)       open(pathname,flags,mode);
     error                = errno;
@@ -26 +26 @@
     std::cout << "\tmode  /10 : " << std::dec << (unsigned int) mode     << std::endl;
     std::cout << "\tmode  /16 : " << std::hex << (unsigned int) mode     << std::endl;
-    std::cout << "\tresult    : " << std::dec << (unsigned int) result   << std::endl;
+    std::cout << "\tresult    : " << static_cast<int32_t>(reinterpret_cast<int64_t>(result)) << std::endl;
     std::cout << "\terrno     : " <<             (unsigned int) error    << std::endl;
     

trunk/IPs/systemC/Environment/Sim2OS/src/Sim2OS_service_read.cpp

@@ -12 +12 @@
       }
     
-    int     fd       = (int)     arguments[1];
+    int     fd       = static_cast<int>(reinterpret_cast<int64_t>(arguments[1]));
     void *  buf      = (void *)  convert_address(arguments[2]);
     ssize_t count    = (ssize_t) arguments[3];
@@ -19 +19 @@
     std::cout << "\n\t***** service : read          *****"        << std::endl;
     std::cout << "\tfd        : " <<             (unsigned int) fd     << std::endl;
-    std::cout << "\tbuf       : " << std::hex << (unsigned int) buf    << std::endl;
+    std::cout << "\tbuf       : " << std::hex << static_cast<int32_t>(reinterpret_cast<int64_t>(buf))    << std::endl;
   //std::cout << "\tbuf       : " << std::dec << (char *)       buf    << std::endl;
     std::cout << "\tcount     : " << std::dec << (unsigned int) count  << std::endl;
-    std::cout << "\tresult    : " <<             (unsigned int) result << std::endl;
+    std::cout << "\tresult    : " << static_cast<int32_t>(reinterpret_cast<int64_t>(result)) << std::endl;
     std::cout << "\terrno     : " <<             (unsigned int) error  << std::endl;
     

trunk/IPs/systemC/Environment/Sim2OS/src/Sim2OS_service_time.cpp

@@ -17 +17 @@
     
     std::cout << "\n\t***** service : time          *****" << std::endl;
-    std::cout << "\tt         : " << std::hex << (unsigned int) t                                      << std::endl;
-    std::cout << "\tresult    : " << std::dec << (unsigned int) result << " - " << ctime((time_t *) t) << std::endl;
+    std::cout << "\tt         : " << std::hex << static_cast<int32_t>(reinterpret_cast<int64_t>(t))                                      << std::endl;
+    std::cout << "\tresult    : " << std::dec << static_cast<int32_t>(reinterpret_cast<int64_t>(result)) << " - " << ctime((time_t *) t) << std::endl;
     std::cout << "\terrno     : " <<             (unsigned int) error                                  << std::endl;
     

trunk/IPs/systemC/Environment/Sim2OS/src/Sim2OS_service_write.cpp

@@ -12 +12 @@
       }
   
-    int         fd       = (int)          arguments[1];
+    int         fd       = static_cast<int>(reinterpret_cast<int64_t>(arguments[1]));
     const void *buf      = (const void *) convert_address(arguments[2]);
     ssize_t     count    = (ssize_t)      arguments[3];
@@ -22 +22 @@
     std::cout << "\n\t***** service : write         *****"        << std::endl;
     std::cout << "\tfd        : " <<             (unsigned int) fd     << std::endl;
-    std::cout << "\tbuf       : " << std::hex << (unsigned int) buf    << std::endl;
+    std::cout << "\tbuf       : " << std::hex << static_cast<int32_t>(reinterpret_cast<int64_t>(buf))    << std::endl;
   //std::cout << "\tbuf       : " << std::dec << (char *)       buf    << std::endl;
     std::cout << "\tcount     : " << std::dec << (unsigned int) count  << std::endl;
-    std::cout << "\tresult    : " <<             (unsigned int) result << std::endl;
+    std::cout << "\tresult    : " << static_cast<int32_t>(reinterpret_cast<int64_t>(result)) << std::endl;
     std::cout << "\terrno     : " <<             (unsigned int) error  << std::endl;