Changeset 759 in dev for branches/x64_compiler_on_32/abdev/BasicCompiler_Common
- Timestamp:
- Sep 26, 2008, 11:49:14 PM (16 years ago)
- Location:
- branches/x64_compiler_on_32/abdev/BasicCompiler_Common
- Files:
-
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/CDebugThreadInfo.cpp
r741 r759 22 22 23 23 BOOL CDebugThreadInfo::Reflesh(int ThreadNum){ 24 #if defined _WIN64 || !defined BUILD_X64_COMPILER 24 25 Free(); 25 26 … … 102 103 103 104 return 1; 105 #else 106 return 0; 107 #endif 104 108 } 105 109 -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/Compile.cpp
r743 r759 7 7 #include "../BasicCompiler_Common/common.h" 8 8 9 #if def _AMD64_9 #if defined _AMD64_ || defined BUILD_X64_COMPILER 10 10 #include "../compiler_x64/opcode.h" 11 11 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/DebugMiddleFile.cpp
r750 r759 3 3 #include "../BasicCompiler_Common/DebugSection.h" 4 4 5 #if def _AMD64_5 #if defined _AMD64_ || defined BUILD_X64_COMPILER 6 6 #include "../compiler_x64/opcode.h" 7 7 #else … … 104 104 // オブジェクトモジュールリストに類似したソースコードリストを作成 105 105 BasicSources sources; 106 sources.reserve( compiler.staticLibraries.size() ); 106 107 foreach( const ObjectModule *pObjectModule, compiler.staticLibraries ) 107 108 { … … 240 241 int maxLineInfoNum = *(long *)(buffer+i2); 241 242 i2+=sizeof(long); 243 _oldSourceLines.reserve( maxLineInfoNum ); 242 244 for(i3=0;i3<maxLineInfoNum;i3++){ 243 245 int nativeCodePos = *(long *)(buffer+i2); … … 319 321 320 322 int pe_size; 321 #if def _AMD64_323 #if defined _AMD64_ || defined BUILD_X64_COMPILER 322 324 IMAGE_NT_HEADERS64 pe_hdr; 323 325 pe_size=sizeof(IMAGE_NT_HEADERS64); -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/Diagnose.cpp
r750 r759 3 3 #include "../BasicCompiler_Common/common.h" 4 4 5 #if def _AMD64_5 #if defined _AMD64_ || defined BUILD_X64_COMPILER 6 6 #include "../compiler_x64/opcode.h" 7 7 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/MakeExe.cpp
r750 r759 192 192 193 193 char coreFilePath[MAX_PATH]; 194 #if defined _AMD64_ 194 #if defined _AMD64_ || defined BUILD_X64_COMPILER 195 195 sprintf( coreFilePath, "..\\lib\\x64\\%s", coreFileName ); 196 196 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/Object.cpp
r485 r759 5 5 #include "../BasicCompiler_Common/common.h" 6 6 7 #if def _AMD64_7 #if defined _AMD64_ || defined BUILD_X64_COMPILER 8 8 #include "../compiler_x64/opcode.h" 9 9 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/OldStatement.cpp
r485 r759 3 3 #include "common.h" 4 4 5 #if def _AMD64_5 #if defined _AMD64_ || defined BUILD_X64_COMPILER 6 6 #include "../compiler_x64/opcode.h" 7 7 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/Overload.cpp
r485 r759 3 3 #include "../BasicCompiler_Common/common.h" 4 4 5 #if def _AMD64_5 #if defined _AMD64_ || defined BUILD_X64_COMPILER 6 6 #include "../compiler_x64/opcode.h" 7 7 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/PESchedule.cpp
r750 r759 5 5 #include "../BasicCompiler_Common/common.h" 6 6 7 #if def _AMD64_7 #if defined _AMD64_ || defined BUILD_X64_COMPILER 8 8 #include "../compiler_x64/opcode.h" 9 9 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/ParamImpl.cpp
r750 r759 1 1 #include "stdafx.h" 2 2 3 #if def _AMD64_3 #if defined _AMD64_ || defined BUILD_X64_COMPILER 4 4 #include "../compiler_x64/opcode.h" 5 5 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/RSrcSection.cpp
r750 r759 864 864 865 865 //プラットフォームをセット 866 #if def _AMD64_866 #if defined _AMD64_ || defined BUILD_X64_COMPILER 867 867 temporary=PermutationString(temporary,"#PLATFORM#","amd64"); 868 868 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/Subroutine.cpp
r751 r759 1 1 #include "stdafx.h" 2 2 3 #if def _AMD64_3 #if defined _AMD64_ || defined BUILD_X64_COMPILER 4 4 #include "../compiler_x64/opcode.h" 5 5 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/VariableOpe.cpp
r750 r759 1 1 #include "stdafx.h" 2 2 3 #if def _AMD64_3 #if defined _AMD64_ || defined BUILD_X64_COMPILER 4 4 #include "../compiler_x64/opcode.h" 5 5 #else … … 74 74 break; 75 75 } 76 #if def _AMD64_76 #if defined _AMD64_ || defined BUILD_X64_COMPILER 77 77 return IsPtrType(type); 78 78 #else … … 93 93 break; 94 94 } 95 #if def _AMD64_95 #if defined _AMD64_ || defined BUILD_X64_COMPILER 96 96 if(IsPtrType(type)) return DEF_INT64; 97 97 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/WatchList.cpp
r750 r759 5 5 #include "common.h" 6 6 7 #if def _AMD64_7 #if defined _AMD64_ || defined BUILD_X64_COMPILER 8 8 #include "../compiler_x64/opcode.h" 9 9 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/calculation.cpp
r672 r759 5 5 #include "../BasicCompiler_Common/common.h" 6 6 7 #if def _AMD64_7 #if defined _AMD64_ || defined BUILD_X64_COMPILER 8 8 #include "../compiler_x64/opcode.h" 9 9 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/common.h
r702 r759 6 6 #include <option.h> 7 7 8 #if def _AMD64_8 #if defined _AMD64_ || defined BUILD_X64_COMPILER 9 9 #include "../compiler_x64/resource.h" 10 10 #include "../compiler_x64/CommandValue.h" … … 39 39 40 40 41 #if def _AMD64_41 #if defined _AMD64_ || defined BUILD_X64_COMPILER 42 42 #define PLATFORM 64 43 43 #else … … 55 55 #endif 56 56 57 #if def _AMD64_57 #if defined _AMD64_ || defined BUILD_X64_COMPILER 58 58 #ifndef IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 59 59 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240 -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/gc.cpp
r508 r759 3 3 #include <Compiler.h> 4 4 5 #if def _AMD64_5 #if defined _AMD64_ || defined BUILD_X64_COMPILER 6 6 #include "../compiler_x64/opcode.h" 7 7 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/hash.cpp
r598 r759 5 5 #include "../BasicCompiler_Common/common.h" 6 6 7 #if def _AMD64_7 #if defined _AMD64_ || defined BUILD_X64_COMPILER 8 8 #include "../compiler_x64/opcode.h" 9 9 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/include/CodeGenerator.h
r641 r759 3 3 #include <LexicalScope.h> 4 4 5 #if def _AMD64_5 #if defined _AMD64_ || defined BUILD_X64_COMPILER 6 6 #include "../../compiler_x64/MachineFixed.h" 7 7 #else … … 303 303 304 304 305 #if def _AMD64_305 #if defined _AMD64_ || defined BUILD_X64_COMPILER 306 306 ///////////////////////////////////////////////////////////////// 307 307 // 64ビット機械語生成 -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/include/ver.h
r388 r759 7 7 #ifdef _AMD64_ 8 8 #define VER_INFO "(x64)" 9 #elif defined BUILD_X64_COMPILER 10 #define VER_INFO "(x64 on x86)" 9 11 #else 10 12 #define VER_INFO "" -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp
r750 r759 3 3 #include <CodeGenerator.h> 4 4 5 #if def _AMD64_5 #if defined _AMD64_ || defined BUILD_X64_COMPILER 6 6 #include "../../compiler_x64/opcode.h" 7 7 #else … … 329 329 void CodeGenerator::op_AddNeedFreeTempStructure( int reg ) 330 330 { 331 #if def _AMD64_331 #if defined _AMD64_ || defined BUILD_X64_COMPILER 332 332 ////////////////////////////////////////////////////// 333 333 ///// レジスタ資源のバックアップ -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/Exception.cpp
r750 r759 1 1 #include "stdafx.h" 2 2 3 #if def _AMD64_3 #if defined _AMD64_ || defined BUILD_X64_COMPILER 4 4 #include "../../compiler_x64/opcode.h" 5 5 #else … … 395 395 } 396 396 397 #if def _WIN64397 #if defined _WIN64 || defined BUILD_X64_COMPILER 398 398 //mov rax,catchAddress 399 399 const PertialSchedule *pPertialSchedule = compiler.codeGenerator.op_mov_RV( sizeof(long), REG_RAX, 0, Schedule::DataTable, true ); … … 408 408 int dataTableOffset = compiler.GetObjectModule().dataTable.Add( static_cast<LONG_PTR>(0) ); 409 409 410 #if def _WIN64410 #if defined _WIN64 || defined BUILD_X64_COMPILER 411 411 //mov rax,dataTableOffset 412 412 compiler.codeGenerator.op_mov_RV( sizeof(_int64), REG_RAX, dataTableOffset, Schedule::DataTable); … … 426 426 } 427 427 428 #if def _WIN64428 #if defined _WIN64 || defined BUILD_X64_COMPILER 429 429 //mov rax,finallyAddress 430 430 const PertialSchedule *pPertialSchedule = compiler.codeGenerator.op_mov_RV( sizeof(long), REG_RAX, 0, Schedule::CatchAddress, true ); … … 439 439 int dataTableOffset = compiler.GetObjectModule().dataTable.Add( static_cast<LONG_PTR>(0) ); 440 440 441 #if def _WIN64441 #if defined _WIN64 || defined BUILD_X64_COMPILER 442 442 //mov rax,dataTableOffset 443 443 compiler.codeGenerator.op_mov_RV( sizeof(_int64), REG_RAX, dataTableOffset, Schedule::DataTable); -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp
r750 r759 2 2 3 3 #include "../common.h" 4 #if def _AMD64_4 #if defined _AMD64_ || defined BUILD_X64_COMPILER 5 5 #include "../../compiler_x64/opcode.h" 6 6 #else -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/LexicalScope.cpp
r750 r759 6 6 #include "../common.h" 7 7 8 #if def _AMD64_8 #if defined _AMD64_ || defined BUILD_X64_COMPILER 9 9 #include "../../compiler_x64/opcode.h" 10 10 #else … … 125 125 //メモリを解放する 126 126 127 #if def _AMD64_127 #if defined _AMD64_ || defined BUILD_X64_COMPILER 128 128 //x64ビットコード 129 129 -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/Linker.cpp
r750 r759 22 22 if( schedule.GetType() == Schedule::DataTable ) 23 23 { 24 #if def _WIN6424 #if defined _WIN64 || defined BUILD_X64_COMPILER 25 25 dataTable.OverwriteInt64( 26 26 schedule.GetOffset(), … … 62 62 { 63 63 // 置き換える値が0の場合を除く 64 #if def _WIN6464 #if defined _WIN64 || defined BUILD_X64_COMPILER 65 65 dataTable.OverwriteInt64( 66 66 schedule.GetOffset(), … … 85 85 if( schedule.GetType() == Schedule::DllProc ) 86 86 { 87 #if def _AMD64_87 #if defined _AMD64_ || defined BUILD_X64_COMPILER 88 88 nativeCode.Overwrite( 89 89 schedule.GetOffset(), … … 192 192 LONG_PTR vtblOffset = schedule.GetClass().GetComVtblOffset(); 193 193 194 #if def _WIN64194 #if defined _WIN64 || defined BUILD_X64_COMPILER 195 195 dataTable.OverwriteInt64( 196 196 schedule.GetOffset(), … … 209 209 LONG_PTR vtblMasterListOffset = schedule.GetClass().GetVtblMasterListOffset(); 210 210 211 #if def _WIN64211 #if defined _WIN64 || defined BUILD_X64_COMPILER 212 212 dataTable.OverwriteInt64( 213 213 schedule.GetOffset(), … … 232 232 LONG_PTR typeInfoDataTableOffset = schedule.GetClass().GetTypeInfoDataTableOffset(); 233 233 234 #if def _WIN64234 #if defined _WIN64 || defined BUILD_X64_COMPILER 235 235 dataTable.OverwriteInt64( 236 236 schedule.GetOffset(), -
branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/ProcedureGenerator.cpp
r750 r759 1 1 #include "stdafx.h" 2 2 3 #if def _AMD64_3 #if defined _AMD64_ || defined BUILD_X64_COMPILER 4 4 #include "../../compiler_x64/opcode.h" 5 5 #else
Note:
See TracChangeset
for help on using the changeset viewer.