1 files changed, 5 insertions, 11 deletions

diff --git a/dynasm/dasm_ppc.h b/dynasm/dasm_ppc.h
index fdb89bce..30b757e3 100644
--- a/dynasm/dasm_ppc.h
+++ b/dynasm/dasm_ppc.h
@@ -69,7 +69,7 @@ struct dasm_State {
   size_t lgsize;
   int *pclabels;                /* PC label chains/pos ptrs. */
   size_t pcsize;
-  void **globals;               /* Array of globals (bias -10). */
+  void **globals;               /* Array of globals. */
   dasm_Section *section;        /* Pointer to active section. */
   size_t codesize;              /* Total size of all code sections. */
   int maxsection;               /* 0 <= sectionidx < maxsection. */
@@ -86,7 +86,6 @@ void dasm_init(Dst_DECL, int maxsection)
 {
   dasm_State *D;
   size_t psz = 0;
-  int i;
   Dst_REF = NULL;
   DASM_M_GROW(Dst, struct dasm_State, Dst_REF, psz, DASM_PSZ(maxsection));
   D = Dst_REF;
@@ -97,12 +96,7 @@ void dasm_init(Dst_DECL, int maxsection)
   D->pcsize = 0;
   D->globals = NULL;
   D->maxsection = maxsection;
-  for (i = 0; i < maxsection; i++) {
-    D->sections[i].buf = NULL;  /* Need this for pass3. */
-    D->sections[i].rbuf = D->sections[i].buf - DASM_SEC2POS(i);
-    D->sections[i].bsize = 0;
-    D->sections[i].epos = 0;  /* Wrong, but is recalculated after resize. */
-  }
+  memset((void *)D->sections, 0, maxsection * sizeof(dasm_Section));
 }
 
 /* Free DynASM state. */
@@ -122,7 +116,7 @@ void dasm_free(Dst_DECL)
 void dasm_setupglobal(Dst_DECL, void **gl, unsigned int maxgl)
 {
   dasm_State *D = Dst_REF;
-  D->globals = gl - 10;  /* Negative bias to compensate for locals. */
+  D->globals = gl;
   DASM_M_GROW(Dst, int, D->lglabels, D->lgsize, (10+maxgl)*sizeof(int));
 }
 
@@ -354,7 +348,7 @@ int dasm_encode(Dst_DECL, void *buffer)
           break;
         case DASM_REL_LG:
           if (n < 0) {
-            n = (int)((ptrdiff_t)D->globals[-n] - (ptrdiff_t)cp);
+            n = (int)((ptrdiff_t)D->globals[-n-10] - (ptrdiff_t)cp);
             goto patchrel;
           }
           /* fallthrough */
@@ -368,7 +362,7 @@ int dasm_encode(Dst_DECL, void *buffer)
           cp[-1] |= ((n+4) & ((ins & 2048) ? 0x0000fffc: 0x03fffffc));
           break;
         case DASM_LABEL_LG:
-          ins &= 2047; if (ins >= 20) D->globals[ins-10] = (void *)(base + n);
+          ins &= 2047; if (ins >= 20) D->globals[ins-20] = (void *)(base + n);
           break;
         case DASM_LABEL_PC: break;
         case DASM_IMM: