diff options
Diffstat (limited to 'compiler_and_linker/unsorted/CCompiler.c')
-rw-r--r-- | compiler_and_linker/unsorted/CCompiler.c | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/compiler_and_linker/unsorted/CCompiler.c b/compiler_and_linker/unsorted/CCompiler.c index 1bac511..06d518f 100644 --- a/compiler_and_linker/unsorted/CCompiler.c +++ b/compiler_and_linker/unsorted/CCompiler.c @@ -13,7 +13,7 @@ Boolean systemHandles; static Boolean using_license_manager; Boolean crippled; SInt32 license_cookie; -CParams cparams; +CompilerLinkerParamBlk cparams; static void get_extension(ConstStringPtr src, char *dst) { int ep; @@ -33,86 +33,86 @@ static int setup_param_block(CWPluginContext context) { static char target_name[128]; CWTargetInfo tinfo; - memset(&cparams, 0, sizeof(CParams)); + memset(&cparams, 0, sizeof(CompilerLinkerParamBlk)); cparams.context = context; - if (CWGetPluginRequest(context, &cparams.pluginRequest) != cwNoErr) + if (CWGetPluginRequest(context, &cparams.request) != cwNoErr) return 0; - if (CWGetAPIVersion(context, &cparams.apiVersion) != cwNoErr) + if (CWGetAPIVersion(context, &cparams.version) != cwNoErr) return 0; - if (CWGetProjectFile(context, &cparams.projectFile) != cwNoErr) + if (CWGetProjectFile(context, &cparams.targetfile) != cwNoErr) return 0; - if (CWGetProjectFileCount(context, &cparams.projectFileCount) != cwNoErr) + if (CWGetProjectFileCount(context, &cparams.numfiles) != cwNoErr) return 0; - if (CWGetMainFileNumber(context, &cparams.mainFileNumber) != cwNoErr) + if (CWGetMainFileNumber(context, &cparams.whichfile) != cwNoErr) return 0; - if (CWGetMainFileSpec(context, &cparams.mainFileSpec) != cwNoErr) + if (CWGetMainFileSpec(context, &cparams.sourcefile) != cwNoErr) return 0; - if (CWGetMainFileText(context, &cparams.mainFileText, &cparams.mainFileTextLength) != cwNoErr) + if (CWGetMainFileText(context, &cparams.sourcetext, &cparams.sourcetextsize) != cwNoErr) return 0; - if (CWIsPrecompiling(context, &cparams.isPrecompiling) != cwNoErr) + if (CWIsPrecompiling(context, &cparams.precompile) != cwNoErr) return 0; - if (CWIsAutoPrecompiling(context, &cparams.isAutoPrecompiling) != cwNoErr) + if (CWIsAutoPrecompiling(context, &cparams.autoprecompile) != cwNoErr) return 0; - if (CWIsPreprocessing(context, &cparams.isPreprocessing) != cwNoErr) + if (CWIsPreprocessing(context, &cparams.preprocess) != cwNoErr) return 0; - if (CWIsGeneratingDebugInfo(context, &cparams.isGeneratingDebugInfo) != cwNoErr) + if (CWIsGeneratingDebugInfo(context, &cparams.SYMinfo) != cwNoErr) return 0; - if (CWIsCachingPrecompiledHeaders(context, &cparams.isCachingPrecompiledHeaders) != cwNoErr) + if (CWIsCachingPrecompiledHeaders(context, &cparams.caching_includes) != cwNoErr) return 0; - if (CWGetBrowseOptions(context, &cparams.browseOptions) != cwNoErr) + if (CWGetBrowseOptions(context, &cparams.browseoptions) != cwNoErr) return 0; - cparams.field276 = cparams.isPreprocessing == 0; - if (CWGetMainFileID(context, &cparams.mainFileID) != cwNoErr) + cparams.recordbrowseinfo = cparams.preprocess == 0; + if (CWGetMainFileID(context, &cparams.browserfileID) != cwNoErr) return 0; if (CWGetTargetInfo(context, &tinfo) != cwNoErr) return 0; cparams.targetOS = tinfo.targetOS; cparams.targetCPU = tinfo.targetCPU; - cparams.targetName = target_name; + cparams.idetargetname = target_name; return CWGetTargetName(context, target_name, sizeof(target_name)) == cwNoErr; } static short store_compile_results(void) { CWResult result; - if (cparams.objectDataHandle) - CWSecretAttachHandle(cparams.context, cparams.objectDataHandle, &cparams.objectdata.objectdata); - if (cparams.browseDataHandle) - CWSecretAttachHandle(cparams.context, cparams.browseDataHandle, &cparams.objectdata.browsedata); + if (cparams.objectdata) + CWSecretAttachHandle(cparams.context, cparams.objectdata, &cparams.object.objectdata); + if (cparams.browsedata) + CWSecretAttachHandle(cparams.context, cparams.browsedata, &cparams.object.browsedata); - if (cparams.isPreprocessing) { - if (cparams.objectdata.objectdata) { + if (cparams.preprocess) { + if (cparams.object.objectdata) { CWNewTextDocumentInfo docinfo; memset(&docinfo, 0, sizeof(CWNewTextDocumentInfo)); - docinfo.text = cparams.objectdata.objectdata; - cparams.objectdata.objectdata = NULL; + docinfo.text = cparams.object.objectdata; + cparams.object.objectdata = NULL; result = CWCreateNewTextDocument(cparams.context, &docinfo); } } else { - result = CWStoreObjectData(cparams.context, cparams.mainFileNumber, &cparams.objectdata); + result = CWStoreObjectData(cparams.context, cparams.whichfile, &cparams.object); } return result; } -static void initialize_compiler_options(CParams *params) { +static void initialize_compiler_options(CompilerLinkerParamBlk *params) { static PFrontEndC pFrontEnd; PWarningC pWarningC; PGlobalOptimizer pGlobalOptimizer; Handle prefsdata; char extension[256]; - memclrw(&copts, sizeof(COpts)); + memclrw(&copts, sizeof(CompilerLinkerOptions)); CWSecretGetNamedPreferences(cparams.context, "C/C++ Compiler", &prefsdata); pFrontEnd = *((PFrontEndC *) *prefsdata); - copts.little_endian = 0; + copts.littleendian = 0; copts.cplusplus = 1; copts.objective_c = pFrontEnd.objective_c; - get_extension(params->mainFileSpec.name, extension); + get_extension(params->sourcefile.name, extension); if (!strcmp(extension, ".c") || !strcmp(extension, ".h") || !strcmp(extension, ".pch")) { copts.cplusplus = pFrontEnd.cplusplus; } else if (!strcmp(extension, ".m")) { @@ -123,34 +123,34 @@ static void initialize_compiler_options(CParams *params) { copts.objective_c = 1; } - copts.require_prototypes = pFrontEnd.checkprotos; - copts.ARM_conform = pFrontEnd.arm; - copts.ARM_scoping = pFrontEnd.arm; + copts.checkprotos = pFrontEnd.checkprotos; + copts.ARMconform = pFrontEnd.arm; + copts.ARMscoping = pFrontEnd.arm; copts.trigraphs = pFrontEnd.trigraphs; - copts.only_std_keywords = pFrontEnd.onlystdkeywords; + copts.onlystdkeywords = pFrontEnd.onlystdkeywords; copts.enumsalwaysint = pFrontEnd.enumsalwaysint; copts.mpwc_relax = pFrontEnd.mpwpointerstyle; - copts.ANSI_strict = pFrontEnd.ansistrict; + copts.ANSIstrict = pFrontEnd.ansistrict; copts.mpwc_newline = pFrontEnd.mpwcnewline; copts.exceptions = pFrontEnd.enableexceptions; copts.dont_reuse_strings = pFrontEnd.dontreusestrings; - copts.pool_strings = pFrontEnd.poolstrings; - copts.dont_inline = pFrontEnd.dontinline; - copts.useRTTI = pFrontEnd.useRTTI; + copts.poolstrings = pFrontEnd.poolstrings; + copts.dontinline = pFrontEnd.dontinline; + copts.RTTI = pFrontEnd.useRTTI; copts.oldprefixname = pFrontEnd.oldprefixname; copts.multibyteaware = pFrontEnd.multibyteaware; - copts.unsignedchars = pFrontEnd.unsignedchars; - copts.autoinline = pFrontEnd.autoinline; + copts.unsigned_char = pFrontEnd.unsignedchars; + copts.auto_inline = pFrontEnd.autoinline; copts.direct_to_som = pFrontEnd.direct_to_som; copts.som_env_check = pFrontEnd.som_env_check; copts.booltruefalse = pFrontEnd.booltruefalse; - copts.always_inline = pFrontEnd.alwaysinline; + copts.alwaysinline = pFrontEnd.alwaysinline; copts.inlinelevel = pFrontEnd.inlinelevel; copts.wchar_type = pFrontEnd.wchar_type; copts.ecplusplus = pFrontEnd.ecplusplus; copts.defer_codegen = pFrontEnd.defer_codegen; - copts.inline_max_size = 512; - copts.inline_max_total_size = 100000; + copts.inlinemaxsize = 512; + copts.inlinemaxtotalsize = 100000; CWSecretGetNamedPreferences(cparams.context, "C/C++ Warnings", &prefsdata); pWarningC = *((PWarningC *) *prefsdata); @@ -172,15 +172,15 @@ static void initialize_compiler_options(CParams *params) { pGlobalOptimizer = *((PGlobalOptimizer *) *prefsdata); copts.optimizationlevel = pGlobalOptimizer.optimizationlevel; - copts.optimize_for_size = (Boolean) (pGlobalOptimizer.optfor == 1); + copts.optimizesize = (Boolean) (pGlobalOptimizer.optfor == 1); copts.crippled = crippled; - copts.loop_unroll_count = 8; - copts.loop_unroll_size_threshold = 100; - copts.isGeneratingDebugInfo = params->isGeneratingDebugInfo; - copts.pchCreator = CWFOURCHAR('C','W','I','E'); - copts.pchType = CWFOURCHAR('M','M','C','H'); - copts.text = CWFOURCHAR('T','E','X','T'); + copts.unrollfactor = 8; + copts.unrollinstrfactor = 100; + copts.filesyminfo = params->SYMinfo; + copts.appltype = CWFOURCHAR('C', 'W', 'I', 'E'); + copts.headtype = CWFOURCHAR('M', 'M', 'C', 'H'); + copts.texttype = CWFOURCHAR('T','E','X','T'); } static void GetLicense(void) { |