1 files changed, 10 insertions, 12 deletions

diff --git a/dynasm/dasm_arm.h b/dynasm/dasm_arm.h
index b88ea17c..824e8be0 100644
--- a/dynasm/dasm_arm.h
+++ b/dynasm/dasm_arm.h
@@ -70,7 +70,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. */
@@ -87,7 +87,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;
@@ -98,12 +97,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. */
@@ -123,7 +117,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));
 }
 
@@ -148,6 +142,7 @@ void dasm_setup(Dst_DECL, const void *actionlist)
   if (D->pclabels) memset((void *)D->pclabels, 0, D->pcsize);
   for (i = 0; i < D->maxsection; i++) {
     D->sections[i].pos = DASM_SEC2POS(i);
+    D->sections[i].rbuf = D->sections[i].buf - D->sections[i].pos;
     D->sections[i].ofs = 0;
   }
 }
@@ -294,7 +289,7 @@ int dasm_link(Dst_DECL, size_t *szp)
 
   { /* Handle globals not defined in this translation unit. */
     int idx;
-    for (idx = 20; idx*sizeof(int) < D->lgsize; idx++) {
+    for (idx = 10; idx*sizeof(int) < D->lgsize; idx++) {
       int n = D->lglabels[idx];
       /* Undefined label: Collapse rel chain and replace with marker (< 0). */
       while (n > 0) { int *pb = DASM_POS2PTR(D, n); n = *pb; *pb = -idx; }
@@ -371,7 +366,10 @@ int dasm_encode(Dst_DECL, void *buffer)
           ins &= 255; while ((((char *)cp - base) & ins)) *cp++ = 0xe1a00000;
           break;
         case DASM_REL_LG:
-          CK(n >= 0, UNDEF_LG);
+          if (n < 0) {
+            n = (int)((ptrdiff_t)D->globals[-n-10] - (ptrdiff_t)cp - 4);
+            goto patchrel;
+          }
           /* fallthrough */
         case DASM_REL_PC:
           CK(n >= 0, UNDEF_PC);
@@ -393,7 +391,7 @@ int dasm_encode(Dst_DECL, void *buffer)
           }
           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: