reorganise things a bit to align further with the actual names/structure

1 files changed, 6 insertions, 6 deletions

diff --git a/compiler_and_linker/unsorted/PCodeAssembly.c b/compiler_and_linker/unsorted/PCodeAssembly.c
index 0455d77..cd3f376 100644
--- a/compiler_and_linker/unsorted/PCodeAssembly.c
+++ b/compiler_and_linker/unsorted/PCodeAssembly.c
@@ -1349,7 +1349,7 @@ SInt32 optimizefinalbranches(SInt32 codesize) {
                         instr->args[2].data.label.label = target->args[0].data.label.label;
                         changed = 1;
                     }
-                } else if (copts.ppc_opt_bclr_bcctr) {
+                } else if (copts.opt_bcc_lr_ctr) {
                     if (target->op == PC_BLR) {
                         if (instr->op == PC_BT)
                             instr->op = PC_BTLR;
@@ -1425,7 +1425,7 @@ SInt32 optimizefinalbranches(SInt32 codesize) {
                         instr->args[3].data.label.label = target->args[0].data.label.label;
                         changed = 1;
                     }
-                } else if (copts.ppc_opt_bclr_bcctr) {
+                } else if (copts.opt_bcc_lr_ctr) {
                     if (target->op == PC_BLR) {
                         instr->op = PC_BCLR;
                         instr->argCount = 3;
@@ -1556,7 +1556,7 @@ SInt32 assemblefunction(Object *func, EntryPoint *entrypoints) {
         codesize = pccomputeoffsets();
     }
 
-    if (copts.code_alignment > 4)
+    if (copts.function_align > 4)
         codesize = insert_align_nops(func, codesize);
 
     tbsize = 0;
@@ -1573,7 +1573,7 @@ SInt32 assemblefunction(Object *func, EntryPoint *entrypoints) {
     codebase = gl->size;
     AppendGListNoData(gl, codesize + tbsize);
 
-    if (copts.isGeneratingDebugInfo) {
+    if (copts.filesyminfo) {
         ObjGen_SymFunc(func);
         ObjGen_Line(functionbodyoffset, 0);
         ObjGen_DeclareSymInfo();
@@ -1590,7 +1590,7 @@ SInt32 assemblefunction(Object *func, EntryPoint *entrypoints) {
 
     for (block = pcbasicblocks; block; block = block->nextBlock) {
         for (offset2 = block->codeOffset, instr = block->firstPCode; instr; instr = instr->nextPCode, offset2 += 4) {
-            if (copts.isGeneratingDebugInfo && instr->sourceoffset != -1)
+            if (copts.filesyminfo && instr->sourceoffset != -1)
                 ObjGen_Line(instr->sourceoffset, offset2);
 
             *((UInt32 *) (*gl->data + codebase + offset2)) = assemblepcode(instr, offset2, &wop);
@@ -1600,7 +1600,7 @@ SInt32 assemblefunction(Object *func, EntryPoint *entrypoints) {
         }
     }
 
-    if (copts.isGeneratingDebugInfo)
+    if (copts.filesyminfo)
         ObjGenMach_SymFuncEnd(func, codesize);
 
     if (copts.traceback)