Changeset 12a919e in tol

Timestamp:

Mar 16, 2011, 3:02:15 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

9247be0

Parents:

d337602

Message:

Fixes #1111
Fixes #1121
New virtual method GetSizeOf due to sizeof(*address_) is not working fine

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3304 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/bbasic

Files:

• cor.cpp (modified) (1 diff)
• tol_bcore.h (modified) (1 diff)
• tol_bfsmem.h (modified) (1 diff)

tol/bbasic/cor.cpp

@@ -56 +56 @@
     return(nCore_);
 }
+
+
+BCore::MemAssignInfo::MemAssignInfo(BCore* address)
+{
+  SetAddress(address);
+}
+
+void BCore::MemAssignInfo::SetAddress(BCore* address)
+{
+  address_ = address;  
+  if(address)
+  {
+    size_    = address_->GetSizeOf();
+    pageNum_ = address_->GetPageNum();
+    assert(size_);
+  }
+  else
+  {
+    size_    = 0;
+    pageNum_ = 0;
+  }
+}
+
+short BCore::MemAssignInfo::IsAssigned() 
+{ 
+  if(!address_) { return(0); }
+  else if(!size_) { return(0); }
+  { 
+    BFixedSizeMemoryBase* hnd = BFixedSizeMemoryBase::Instance(size_);
+    if(!hnd) { return(-1); }
+    else     { return(hnd->IsAssigned(address_,pageNum_)); }
+  }
+}
+
+void BCore::MemAssignInfo::SafeDestroy()
+{
+  if(IsAssigned()>0) 
+  { 
+    address_->Destroy(); 
+    address_ = NULL;
+  }
+}

tol/bbasic/tol_bcore.h

@@ -62 +62 @@
     virtual BFixedSizeMemoryBase* GetMemHandler() const { return(NULL); }
     virtual unsigned short  GetPageNum   () const { return(0); }
+    virtual size_t GetSizeOf() const { return(0); } 
     struct TOL_API MemAssignInfo
     {
       BCore*                address_;
+      size_t                size_;
       unsigned short        pageNum_;
 
-      MemAssignInfo(BCore* address)
-      {
-        SetAddress(address);
-      }
-
-      void SetAddress(BCore* address)
-      {
-        address_ = address;  
-        if(address)
-        {
-          pageNum_    = address_->GetPageNum();
-        }
-        else
-        {
-          pageNum_    = 0;
-        }
-      }
-
-      short IsAssigned() 
-      { 
-        if(!address_) { return(0); }
-        else 
-        { 
-          BFixedSizeMemoryBase* hnd = BFSMSingleton<sizeof(*address_)>::Handler();
-          if(!hnd) { return(-1); }
-          else     { return(hnd->IsAssigned(address_,pageNum_)); }
-        }
-      }
-
-      void SafeDestroy()
-      {
-        if(IsAssigned()>0) 
-        { 
-          address_->Destroy(); 
-          address_ = NULL;
-        }
-      }
+      MemAssignInfo(BCore* address);
+      void SetAddress(BCore* address);
+      short IsAssigned();
+      void SafeDestroy();
     };
 #else

tol/bbasic/tol_bfsmem.h

@@ -63 +63 @@
     return(BFSMSingleton<sizeof(ANY_)>::Handler()); \
   } \
+  size_t GetSizeOf() const \
+  { \
+    return(sizeof(ANY_)); \
+  } \
   unsigned short GetPageNum() const \
   { \