Changeset 751 in dev for trunk

Timestamp:

Sep 24, 2008, 2:36:26 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

性能がよいというdlmallocを導入。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/Intermediate_Step1.cpp (modified) (6 diffs)
• BasicCompiler_Common/Intermediate_Step2.cpp (modified) (4 diffs)
• BasicCompiler_Common/Subroutine.cpp (modified) (2 diffs)
• BasicCompiler_Common/src/BoostSerializationSupport.cpp (modified) (1 diff)
• ab_common/ab_common.vcproj (modified) (1 diff)
• ab_common/src/Environment.cpp (modified) (1 diff)
• malloc.c (added)

trunk/ab5.0/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ -55 +55 @@
 void DeleteComment(char *buffer){   //注釈「'」の取り除き
     int i,i2,i3,IsStr;
-    char *temporary=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,lstrlen(buffer)+1);
+    char *temporary=(char *)calloc(lstrlen(buffer)+1,sizeof (char));
     for(i=0,i2=0,i3=0,IsStr=0;;i++,i2++){
         if(buffer[i]=='\"') IsStr^=1;
@@ -99 +99 @@
     }
     lstrcpy(buffer,temporary);
-    HeapDefaultFree(temporary);
+    free(temporary);
 }
 void CheckParenthesis(char *buffer){
@@ -372 +372 @@
 
     bool isBeforeCharDelimitation = true;
-    temporary=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,(lstrlen(buffer)+255)*2);
+    temporary=(char *)calloc((lstrlen(buffer)+255)*2,sizeof (char));
     for(i=0,i2=0,IsStr=0;;i++,i2++){
         if(buffer[i]=='\"') IsStr^=1;
@@ -990 +990 @@
     }
     lstrcpy(buffer,temporary);
-    HeapDefaultFree(temporary);
+    free(temporary);
 }
 void DefCommandFormat(char *buffer){
@@ -1182 +1182 @@
     int i,i2;
 
-    char *temporary;
-    temporary=(char *)HeapAlloc(hHeap,0,lstrlen(buffer)*2+1024);
+    char *temporary = (char*)malloc(strlen(buffer)*2+1024);
 
     //１行Ifをブロック形式にする
@@ -1213 +1212 @@
     }
 
-    HeapDefaultFree(temporary);
+    free(temporary);
 }
 void CheckPareCommand(void){

trunk/ab5.0/abdev/BasicCompiler_Common/Intermediate_Step2.cpp

@@ -395 +395 @@
     char *temporary,*tempBase,temp2[VN_SIZE],*lpCommand;
 
-    tempBase=(char *)HeapAlloc(hHeap,0,(lstrlen(buffer)+1)*2+8192);
+    tempBase=(char *)malloc((lstrlen(buffer)+1)*2+8192);
     temporary=tempBase+1;
     temporary[0]=0;
@@ -402 +402 @@
 
     CommandBufferSize=512;
-    lpCommand=(char *)HeapAlloc(hHeap,0,CommandBufferSize);
+
+    lpCommand=(char *)malloc(CommandBufferSize);
 
     while(1){
@@ -417 +418 @@
             if(i2>=CommandBufferSize){  //バッファ領域が足りなくなった場合はバッファを増量する
                 CommandBufferSize+=512;
-                lpCommand=(char *)HeapReAlloc(hHeap,0,lpCommand,CommandBufferSize);
+                lpCommand=(char *)realloc(lpCommand,CommandBufferSize);
             }
             if(buffer[i]=='\"') IsStr^=1;
@@ -463 +464 @@
         if(buffer[i]=='\0') break;
     }
-    HeapDefaultFree(lpCommand);
+    free(lpCommand);
     lstrcpy(buffer,temporary);
 
-    HeapDefaultFree(tempBase);
+    free(tempBase);
 }

trunk/ab5.0/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -232 +232 @@
     //パラメータを整備
     char *Parameter;
-    Parameter=(char *)HeapAlloc(hHeap,0,lstrlen(ArrayElements)+(rightSide ? lstrlen(rightSide) : 0)+32);
+    Parameter=(char *)malloc(lstrlen(ArrayElements)+(rightSide ? lstrlen(rightSide) : 0)+32);
     lstrcpy(Parameter,ArrayElements);
     if(rightSide){
@@ -255 +255 @@
     }
 
-    HeapDefaultFree(Parameter);
+    free(Parameter);
 
     return true;

trunk/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

@@ -45 +45 @@
 #include <jenga/include/jenga.h>
 
+#include <abdev/ab_common/include/libs.h>
+
 using namespace Jenga::Common;
 

trunk/ab5.0/abdev/ab_common/ab_common.vcproj

@@ -282 +282 @@
                 RelativePath=".\src\Environment.cpp"
                 >
+            </File>
+            <File
+                RelativePath="..\malloc.c"
+                >
+                <FileConfiguration
+                    Name="Debug(x86)|Win32"
+                    >
+                    <Tool
+                        Name="VCCLCompilerTool"
+                        PreprocessorDefinitions="USE_DL_PREFIX"
+                        UsePrecompiledHeader="0"
+                    />
+                </FileConfiguration>
+                <FileConfiguration
+                    Name="Release(x86)|Win32"
+                    >
+                    <Tool
+                        Name="VCCLCompilerTool"
+                        Optimization="3"
+                        PreprocessorDefinitions="USE_DL_PREFIX"
+                        UsePrecompiledHeader="0"
+                    />
+                </FileConfiguration>
+                <FileConfiguration
+                    Name="Debug(x64)|Win32"
+                    >
+                    <Tool
+                        Name="VCCLCompilerTool"
+                        PreprocessorDefinitions="USE_DL_PREFIX"
+                        UsePrecompiledHeader="0"
+                    />
+                </FileConfiguration>
+                <FileConfiguration
+                    Name="Release(x64)|Win32"
+                    >
+                    <Tool
+                        Name="VCCLCompilerTool"
+                        PreprocessorDefinitions="USE_DL_PREFIX"
+                        UsePrecompiledHeader="0"
+                    />
+                </FileConfiguration>
             </File>
             <File

trunk/ab5.0/abdev/ab_common/src/Environment.cpp

@@ -35 +35 @@
     throw;
 }
+
+void* operator new( std::size_t n )
+{
+    if ( void* p = dlmalloc(n) ){
+        return p;
+    }
+    else{
+        throw std::bad_alloc();
+    }
+}
+
+void* operator new[]( std::size_t n )
+{
+    return ::operator new( n );
+}
+
+void operator delete( void* p )
+{
+    dlfree( p );
+}
+
+void operator delete[]( void* p )
+{
+    ::operator delete( p );
+}