Ensured all symbol comments match their symbol address.

3 files changed, 54 insertions, 111 deletions

diff --git a/plugins/readelf/header.c b/plugins/readelf/header.c
index 8d9309e..4301cc2 100644
--- a/plugins/readelf/header.c
+++ b/plugins/readelf/header.c
@@ -48,7 +48,6 @@ bool annotate_elf_header(GElfFormat *format)
     const elf_header *header;               /* En-tête principale          */
     SourceEndian endian;                    /* Boutisme utilisé            */
     vmpa2t pos;                             /* Tête de lecture des symboles*/
-    vmpa2t start;                           /* Localisation des symboles   */
     GArchInstruction *instr;                /* Instruction décodée         */
     GArchOperand *operand;                  /* Opérande à venir modifier   */
     GDbComment *comment;                    /* Définition de commentaire   */
@@ -65,14 +64,13 @@ bool annotate_elf_header(GElfFormat *format)
 
     /* ELFMAG (0) */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_8_BITS, 4, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 1, IOD_CHAR);
     SET_IMM_DISPLAY(instr, operand, 2, IOD_CHAR);
     SET_IMM_DISPLAY(instr, operand, 3, IOD_CHAR);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("ELF magic number"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("ELF magic number"));
 
     /* EI_CLASS (4) */
 
@@ -92,12 +90,11 @@ bool annotate_elf_header(GElfFormat *format)
             break;
     }
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_8_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, text);
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, text);
 
     /* EI_DATA (5) */
 
@@ -117,12 +114,11 @@ bool annotate_elf_header(GElfFormat *format)
             break;
     }
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_8_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, text);
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, text);
 
     /* EI_VERSION (6) */
 
@@ -139,12 +135,11 @@ bool annotate_elf_header(GElfFormat *format)
             break;
     }
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_8_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, text);
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, text);
 
     /* EI_OSABI (7) */
 
@@ -197,30 +192,27 @@ bool annotate_elf_header(GElfFormat *format)
             break;
     }
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_8_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, text);
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, text);
 
     /* EI_ABIVERSION (8) */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_8_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("ABI version"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("ABI version"));
 
     /* Padding */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_8_BITS, 7, &pos, endian);
 
     g_raw_instruction_mark_as_padding(G_RAW_INSTRUCTION(instr), true);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Padding"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Padding"));
 
     /* Champ "e_type" */
 
@@ -252,12 +244,11 @@ bool annotate_elf_header(GElfFormat *format)
             break;
     }
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_16_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, text);
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, text);
 
     /* Champ "e_machine" */
 
@@ -344,44 +335,39 @@ bool annotate_elf_header(GElfFormat *format)
         default:		    text = _("Architecture: unknown"); break;
     }
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_16_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, text);
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, text);
 
     /* Champ "e_version" */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Object file version"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Object file version"));
 
     if (header->hdr32.e_ident[EI_CLASS] == ELFCLASS32)
     {
         /* Champ "e_entry" */
 
-        copy_vmpa(&start, &pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, &pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Entry point virtual address"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Entry point virtual address"));
 
         /* Champ "e_phoff" */
 
-        copy_vmpa(&start, &pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, &pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Program header table file offset"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Program header table file offset"));
 
         /* Champ "e_shoff" */
 
-        copy_vmpa(&start, &pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, &pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section header table file offset"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section header table file offset"));
 
     }
 
@@ -389,24 +375,21 @@ bool annotate_elf_header(GElfFormat *format)
     {
         /* Champ "e_entry" */
 
-        copy_vmpa(&start, &pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, &pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Entry point virtual address"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Entry point virtual address"));
 
         /* Champ "e_phoff" */
 
-        copy_vmpa(&start, &pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, &pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Program header table file offset"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Program header table file offset"));
 
         /* Champ "e_shoff" */
 
-        copy_vmpa(&start, &pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, &pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section header table file offset"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section header table file offset"));
 
     }
 
@@ -414,66 +397,59 @@ bool annotate_elf_header(GElfFormat *format)
 
     /* Champ "e_flags" */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, &pos, endian);
 
     //SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Processor-specific flags"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Processor-specific flags"));
 
     /* Champ "e_ehsize" */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_16_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("ELF header size in bytes"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("ELF header size in bytes"));
 
     /* Champ "e_phentsize" */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_16_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Program header table entry size"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Program header table entry size"));
 
     /* Champ "e_phnum" */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_16_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Program header table entry count"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Program header table entry count"));
 
     /* Champ "e_shentsize" */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_16_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section header table entry size"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section header table entry size"));
 
     /* Champ "e_shnum" */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_16_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section header table entry count"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section header table entry count"));
 
     /* Champ "e_shstrndx" */
 
-    copy_vmpa(&start, &pos);
     instr = g_raw_instruction_new_array(content, MDS_16_BITS, 1, &pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section header string table index"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section header string table index"));
 
     g_object_unref(G_OBJECT(content));
 
diff --git a/plugins/readelf/program.c b/plugins/readelf/program.c
index fffb495..eb3bfeb 100644
--- a/plugins/readelf/program.c
+++ b/plugins/readelf/program.c
@@ -57,7 +57,6 @@ static bool annotate_elf_program_header(GElfFormat *format, SourceEndian endian,
     GBinContent *content;                   /* Contenu binaire à lire      */
     ImmOperandDisplay disp;                 /* Afficahge de valeur         */
     const char *text;                       /* Texte constant à insérer    */
-    vmpa2t start;                           /* Localisation des symboles   */
     GArchInstruction *instr;                /* Instruction décodée         */
     GArchOperand *operand;                  /* Opérande à venir modifier   */
     GDbComment *comment;                    /* Définition de commentaire   */
@@ -139,49 +138,43 @@ static bool annotate_elf_program_header(GElfFormat *format, SourceEndian endian,
             break;
     }
 
-    copy_vmpa(&start, pos);
     instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, disp);
 
-    ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, text);
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, text);
 
     if (format->is_32b)
     {
         /* Champ "p_offset" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment file offset"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment file offset"));
 
         /* Champ "p_vaddr" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment virtual address"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment virtual address"));
 
         /* Champ "p_paddr" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment physical address"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment physical address"));
 
         /* Champ "p_filesz" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment size in file"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment size in file"));
 
         /* Champ "p_memsz" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment size in memory"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment size in memory"));
 
         /* Champ "p_flags" */
 
@@ -215,19 +208,17 @@ static bool annotate_elf_program_header(GElfFormat *format, SourceEndian endian,
         if (!filled)
             dtext = stradd(dtext, _("none"));
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, dtext);
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, dtext);
 
         free(dtext);
 
         /* Champ "p_align" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment alignment"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment alignment"));
 
     }
     else
@@ -264,54 +255,47 @@ static bool annotate_elf_program_header(GElfFormat *format, SourceEndian endian,
         if (!filled)
             dtext = stradd(dtext, _("none"));
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, dtext);
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, dtext);
 
         free(dtext);
 
         /* Champ "p_offset" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment file offset"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment file offset"));
 
         /* Champ "p_vaddr" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment virtual address"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment virtual address"));
 
         /* Champ "p_paddr" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment physical address"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment physical address"));
 
         /* Champ "p_filesz" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment size in file"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment size in file"));
 
         /* Champ "p_memsz" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment size in memory"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment size in memory"));
 
         /* Champ "p_align" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, pos, instr, comment, _("Segment alignment"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Segment alignment"));
 
     }
 
diff --git a/plugins/readelf/section.c b/plugins/readelf/section.c
index 815bac9..ed22069 100644
--- a/plugins/readelf/section.c
+++ b/plugins/readelf/section.c
@@ -60,7 +60,6 @@ static bool annotate_elf_section_header(GElfFormat *format, SourceEndian endian,
     const char *secname;                    /* Nom d'une section analysée  */
     ImmOperandDisplay disp;                 /* Afficahge de valeur         */
     const char *text;                       /* Texte constant à insérer    */
-    vmpa2t start;                           /* Localisation des symboles   */
     GArchInstruction *instr;                /* Instruction décodée         */
     GArchOperand *operand;                  /* Opérande à venir modifier   */
     GDbComment *comment;                    /* Définition de commentaire   */
@@ -87,12 +86,11 @@ static bool annotate_elf_section_header(GElfFormat *format, SourceEndian endian,
         dtext = stradd(dtext, "'");
     }
 
-    copy_vmpa(&start, pos);
     instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, dtext);
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, dtext);
 
     free(dtext);
 
@@ -214,12 +212,11 @@ static bool annotate_elf_section_header(GElfFormat *format, SourceEndian endian,
             break;
     }
 
-    copy_vmpa(&start, pos);
     instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
     SET_IMM_DISPLAY(instr, operand, 0, disp);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, text);
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, text);
 
     /* Champ "sh_flags"... */
 
@@ -269,123 +266,109 @@ static bool annotate_elf_section_header(GElfFormat *format, SourceEndian endian,
     {
         /* Champ "sh_flags" (suite) */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, dtext);
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, dtext);
 
         free(dtext);
 
         /* Champ "sh_addr" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section virtual addr at execution"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section virtual addr at execution"));
 
         /* Champ "sh_offset" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section file offset"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section file offset"));
 
         /* Champ "sh_size" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
         SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section size in bytes"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section size in bytes"));
 
     }
     else
     {
         /* Champ "sh_flags" (suite) */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, dtext);
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, dtext);
 
         free(dtext);
 
         /* Champ "sh_addr" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section virtual addr at execution"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section virtual addr at execution"));
 
         /* Champ "sh_offset" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section file offset"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section file offset"));
 
         /* Champ "sh_size" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
         SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section size in bytes"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section size in bytes"));
 
     }
 
     /* Champ "sh_link" */
 
-    copy_vmpa(&start, pos);
     instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Link to another section"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Link to another section"));
 
     /* Champ "sh_info" */
 
-    copy_vmpa(&start, pos);
     instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-    ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Additional section information"));
+    ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Additional section information"));
 
     if (format->is_32b)
     {
         /* Champ "sh_addralign" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section alignment"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section alignment"));
 
         /* Champ "sh_entsize" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_32_BITS, 1, pos, endian);
 
         SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Entry size if section holds table"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Entry size if section holds table"));
 
     }
     else
     {
         /* Champ "sh_addralign" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Section alignment"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Section alignment"));
 
         /* Champ "sh_entsize" */
 
-        copy_vmpa(&start, pos);
         instr = g_raw_instruction_new_array(content, MDS_64_BITS, 1, pos, endian);
 
         SET_IMM_DISPLAY(instr, operand, 0, IOD_DEC);
 
-        ADD_RAW_AS_SYM(format, symbol, &start, instr, comment, _("Entry size if section holds table"));
+        ADD_RAW_AS_SYM(format, symbol, instr, comment, _("Entry size if section holds table"));
 
     }