tccasm: Implement .pushsection and .popsection

Michael Matz committed 10 years ago

Commit c82e52d1 parent 6763b024 files · +40 −3Browse files

Unified · Split

4 files

@@ -448,8 +448,8 @@ typedef struct Section { · 447 unmodified lines
448	int nb_hashed_syms; /* used to resize the hash table */	448	int nb_hashed_syms; /* used to resize the hash table */
449	struct Section link; / link to another section */	449	struct Section link; / link to another section */
450	struct Section reloc; / corresponding section for relocation, if any */	450	struct Section reloc; / corresponding section for relocation, if any */
451	struct Section hash; / hash table for symbols */	451	struct Section hash; / hash table for symbols */
452	struct Section *next;	452	struct Section prev; / previous section on section stack */
453	char name[1]; /* section name */	453	char name[1]; /* section name */
454	} Section;	454	} Section;
455		455

     use_section1(s1, sec);
 }
+static void push_section(TCCState *s1, const char *name)
+{
+    Section *sec = find_section(s1, name);
+    sec->prev = cur_text_section;
+    use_section1(s1, sec);
+}
+static void pop_section(TCCState *s1)
+{
+    Section *prev = cur_text_section->prev;
+    if (!prev)
+        tcc_error(".popsection without .pushsection");
+    cur_text_section->prev = NULL;
+    use_section1(s1, prev);
+}
 static void asm_parse_directive(TCCState *s1)
 {
     int n, offset, v, size, tok1;
             next();
         }
         break;
+    case TOK_ASMDIR_pushsection:
     case TOK_ASMDIR_section:
         {
             char sname[256];
+	    tok1 = tok;
             /* XXX: support more options */
             next();
             sname[0] = '\0';
                 }
             }
             last_text_section = cur_text_section;
-            use_section(s1, sname);
+	    if (tok1 == TOK_ASMDIR_section)
+	        use_section(s1, sname);
+	    else
+	        push_section(s1, sname);
         }
         break;
     case TOK_ASMDIR_previous:
             last_text_section = sec;
         }
         break;
+    case TOK_ASMDIR_popsection:
+	next();
+	pop_section(s1);
+	break;
 #ifdef TCC_TARGET_I386
     case TOK_ASMDIR_code16:
         {

  DEF_ASMDIR(data)
  DEF_ASMDIR(bss)
  DEF_ASMDIR(previous)
+ DEF_ASMDIR(pushsection)
+ DEF_ASMDIR(popsection)
  DEF_ASMDIR(fill)
  DEF_ASMDIR(rept)
  DEF_ASMDIR(endr)

@@ -717,6 +717,16 @@ ft1: ft2: ft3: ft4: ft5: ft6: ft7: ft8: ft9: · 716 unmodified lines
717	.endr	717	.endr
718	.fill 4,1,0x90	718	.fill 4,1,0x90
719		719
		720	.section .text.one,"ax"
		721	nop
		722	.previous
		723	.pushsection .text.one,"ax"
		724	nop
		725	.pushsection .text.two,"ax"
		726	nop
		727	.popsection
		728	.popsection
		729
720	movd %esi, %mm1	730	movd %esi, %mm1
721	movd %edi, %xmm2	731	movd %edi, %xmm2
722	movd (%ebx), %mm3	732	movd (%ebx), %mm3

Keyboard shortcuts