Changeset 188 in dev for trunk/abdev

Timestamp:

Jun 25, 2007, 5:41:01 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler64/BasicCompiler.vcproj (modified) (3 diffs)
• BasicCompiler64/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler_Common/BasicCompiler.cpp (modified) (1 diff)
• BasicCompiler_Common/Const.cpp (modified) (1 diff)
• BasicCompiler_Common/Const.h (modified) (1 diff)
• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -337 +337 @@
 
     obp_AllocSize=8192*2;
-    OpBuffer=(char *)HeapAlloc(hHeap,0,obp_AllocSize);
+    OpBuffer=(char *)malloc(obp_AllocSize);
     obp=0;
 

trunk/abdev/BasicCompiler64/BasicCompiler.vcproj

@@ -47 +47 @@
             <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/GR"
                 Optimization="0"
                 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
@@ -53 +54 @@
                 BasicRuntimeChecks="0"
                 RuntimeLibrary="1"
+                RuntimeTypeInfo="true"
                 UsePrecompiledHeader="0"
                 PrecompiledHeaderFile=".\Debug/BasicCompiler.pch"
@@ -151 +153 @@
             <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/GR"
                 Optimization="2"
                 InlineFunctionExpansion="2"
                 EnableIntrinsicFunctions="true"
                 FavorSizeOrSpeed="1"
-                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\STLPort;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
+                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
                 MinimalRebuild="false"

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -176 +176 @@
     //クラス情報を取得（※注 - GetSubInfoの後に呼び出す）
     Smoothie::GetMeta().GetClasses().GetAllClassInfo();
+
+    Smoothie::GetMeta().Write( Jenga::Common::Environment::GetAppDir() + "\\meta_test.xml" );
 
     //コードと行番号の関係

trunk/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ -552 +552 @@
     char temporary[1024],temp2[MAX_PATH];
 
-    MessageBox(0,"starting compiler/debugger","ActiveBasic",MB_OK);
+    //MessageBox(0,"starting compiler/debugger","ActiveBasic",MB_OK);
     trace( "Start ActiveBasic Compiler!" );
 

trunk/abdev/BasicCompiler_Common/Const.cpp

@@ -26 +26 @@
 
 
-CConst::CConst( const NamespaceScopes &namespaceScopes, const string &name, const Type &type, _int64 i64data)
+CConst::CConst( const NamespaceScopes &namespaceScopes, const string &name, const Type &newType, _int64 i64data)
     : ConstBase( namespaceScopes, name )
-    , type( type )
+    , type( newType )
     , i64data( i64data )
     , pNext( NULL )

trunk/abdev/BasicCompiler_Common/Const.h

@@ -36 +36 @@
     CConst *pNext;
 
-    CConst( const NamespaceScopes &namespaceScopes, const string &name, const Type &type, _int64 i64data);
+    CConst( const NamespaceScopes &namespaceScopes, const string &name, const Type &newType, _int64 i64data);
     CConst( const NamespaceScopes &namespaceScopes, const string &name, int value);
     ~CConst();

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -906 +906 @@
 
     if(OpBuffer) HeapDefaultFree(OpBuffer);
-    OpBuffer=(char *)HeapAlloc(hHeap,0,SizeOf_CodeSection);
+    OpBuffer=(char *)malloc(SizeOf_CodeSection);
 
     ReadProcessMemory(hDebugProcess,