Changeset 537 in dev for trunk/ab5.0/abdev/compiler_x86
- Timestamp:
- May 3, 2008, 6:58:38 PM (17 years ago)
- Location:
- trunk/ab5.0/abdev/compiler_x86
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/compiler_x86/Compile_Func.cpp
r536 r537 614 614 } 615 615 616 resultType = UserProc::CompilingUserProc().ReturnType();616 resultType = compiler.GetCompilingUserProc().ReturnType(); 617 617 } 618 618 void Opcode_Func_System_Get_Bp() -
trunk/ab5.0/abdev/compiler_x86/Compile_ProcOp.cpp
r536 r537 32 32 33 33 const UserProc *pBackUserProc; 34 pBackUserProc = & UserProc::CompilingUserProc();35 UserProc::CompileStartForGlobalArea();34 pBackUserProc = &compiler.GetCompilingUserProc(); 35 compiler.StartGlobalAreaCompile(); 36 36 37 37 int BackCp; … … 57 57 GetGlobalDataForDll(); 58 58 59 UserProc::CompileStartForUserProc( pBackUserProc );59 compiler.SetCompilingUserProc( pBackUserProc ); 60 60 cp=BackCp; 61 61 … … 89 89 90 90 const UserProc *pBackUserProc; 91 pBackUserProc = & UserProc::CompilingUserProc();92 UserProc::CompileStartForGlobalArea();91 pBackUserProc = &compiler.GetCompilingUserProc(); 92 compiler.StartGlobalAreaCompile(); 93 93 94 94 compiler.codeGenerator.lexicalScopes.CallDestructorsOfScopeEnd(); 95 95 96 UserProc::CompileStartForUserProc( pBackUserProc );96 compiler.SetCompilingUserProc( pBackUserProc ); 97 97 98 98 … … 225 225 UserProc::pGlobalProc = &userProc; 226 226 227 const UserProc *pBackUserProc = & UserProc::CompilingUserProc();228 UserProc::CompileStartForGlobalArea();227 const UserProc *pBackUserProc = &compiler.GetCompilingUserProc(); 228 compiler.StartGlobalAreaCompile(); 229 229 230 230 int BackCp = cp; … … 250 250 } 251 251 252 UserProc::CompileStartForUserProc( pBackUserProc );252 compiler.SetCompilingUserProc( pBackUserProc ); 253 253 cp=BackCp; 254 254 } -
trunk/ab5.0/abdev/compiler_x86/Compile_Statement.cpp
r465 r537 893 893 894 894 void OpcodeExitSub(void){ 895 if( UserProc::IsGlobalAreaCompiling() ){895 if( compiler.IsGlobalAreaCompiling() ){ 896 896 compiler.errorMessenger.Output(12,"Exit Sub/Function",cp); 897 897 return; … … 1231 1231 } 1232 1232 void OpcodeReturn(char *Parameter){ 1233 if( UserProc::IsGlobalAreaCompiling() ){1233 if( compiler.IsGlobalAreaCompiling() ){ 1234 1234 //Gosub~Returnとして扱う 1235 1235 … … 1240 1240 //戻り値をセット 1241 1241 if(Parameter[0]){ 1242 const UserProc &proc = UserProc::CompilingUserProc();1242 const UserProc &proc = compiler.GetCompilingUserProc(); 1243 1243 1244 1244 const char *temp = "_System_ReturnValue"; -
trunk/ab5.0/abdev/compiler_x86/Compile_Var.cpp
r536 r537 388 388 389 389 390 if( UserProc::IsLocalAreaCompiling() ){390 if( compiler.IsLocalAreaCompiling() ){ 391 391 ////////////////// 392 392 // ローカル変数 393 393 ////////////////// 394 394 395 const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) );395 const Variable *pVar = compiler.GetCompilingUserProc().GetLocalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) ); 396 396 if( pVar ){ 397 397 //ポインタ変数の場合 … … 517 517 518 518 char temporary[VN_SIZE]; 519 if( UserProc::IsLocalAreaCompiling() ){519 if( compiler.IsLocalAreaCompiling() ){ 520 520 GetNowStaticVarFullName(VarName,temporary); 521 521 … … 1092 1092 1093 1093 void dim( char *VarName, const Subscripts &subscripts, const Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlags){ 1094 if( UserProc::IsGlobalAreaCompiling() ){1094 if( compiler.IsGlobalAreaCompiling() ){ 1095 1095 ///////////////////////// 1096 1096 // グローバル変数 … … 1104 1104 ///////////////// 1105 1105 1106 if( UserProc::CompilingUserProc().GetLocalVars().DuplicateCheck( LexicalAnalyzer::FullNameToSymbol( VarName ) ) ){1106 if( compiler.GetCompilingUserProc().GetLocalVars().DuplicateCheck( LexicalAnalyzer::FullNameToSymbol( VarName ) ) ){ 1107 1107 //2重定義のエラー 1108 1108 compiler.errorMessenger.Output(15,VarName,cp); … … 1128 1128 1129 1129 // 変数を追加 1130 UserProc::CompilingUserProc().GetLocalVars().push_back( pVar );1130 compiler.GetCompilingUserProc().GetLocalVars().push_back( pVar ); 1131 1131 1132 1132 //アラインメントを考慮 … … 1145 1145 // 呼び出し側のオフセットズレを考慮する 1146 1146 1147 if( 0 == ( UserProc::CompilingUserProc().RealParams().GetMemorySize() + PTR_SIZE /* ret分 */ ) % alignment ){1147 if( 0 == ( compiler.GetCompilingUserProc().RealParams().GetMemorySize() + PTR_SIZE /* ret分 */ ) % alignment ){ 1148 1148 AllLocalVarSize += PTR_SIZE; 1149 1149 } -
trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp
r536 r537 365 365 366 366 cp=-1; 367 UserProc::CompileStartForGlobalArea();367 compiler.StartGlobalAreaCompile(); 368 368 369 369 if( !compiler.IsDll() ){
Note:
See TracChangeset
for help on using the changeset viewer.