public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
* [Patch][Gold] BE8 for ARM
@ 2016-07-07 23:25 Bharathi Seshadri (bseshadr)
  2016-08-09  9:57 ` Richard Earnshaw (lists)
  0 siblings, 1 reply; 17+ messages in thread
From: Bharathi Seshadri (bseshadr) @ 2016-07-07 23:25 UTC (permalink / raw)
  To: binutils; +Cc: ccoutant

[-- Attachment #1: Type: text/plain, Size: 709 bytes --]

Hi,

This patch implements the BE8 support for ARM in the gold linker. It has been tested on a non-trivial large program (size ~120MB). 
Thanks to Cary Coutant for his initial review.

gold/ChangeLog
2016-07-07  Bharathi Seshadri  <bseshadr@cisco.com>

        * options.h (General_options): Add --be8 option.
        * arm.cc (Arm_relobj::do_relocate_sections): Add code to swap for be8.
          (Output_data_plt_arm_standard::do_fill_first_plt_entry): Likewise.
          (Output_data_plt_arm_short::do_fill_plt_entry): Likewise.
          (Output_data_plt_arm_long::do_fill_plt_entry): Likewise.
          (Target_arm::do_adjust_elf_header): Do EF_ARM_BE8 adjustment.

Regards,
Bharathi

[-- Attachment #2: be8_arm_patch.txt --]
[-- Type: text/plain, Size: 6977 bytes --]

diff --git a/gold/arm.cc b/gold/arm.cc
index c47b002..4b0f85f 100644
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -6639,6 +6639,60 @@ Arm_relobj<big_endian>::do_relocate_sections(
 	      section_address,
 	      section_size);
 	}
+
+	// BE8 swapping 
+ 	if (parameters->options().user_set_be8()) 
+	  {
+	    section_size_type  span_start, span_end;
+	    elfcpp::Shdr<32, big_endian> 
+	      shdr(pshdrs + i * elfcpp::Elf_sizes<32>::shdr_size);
+	    Mapping_symbol_position section_start(i, 0);
+	    typename Mapping_symbols_info::const_iterator p =
+	      this->mapping_symbols_info_.lower_bound(section_start);
+	    unsigned char* view = (*pviews)[i].view;
+	    Arm_address view_address = (*pviews)[i].address;
+	    section_size_type view_size = (*pviews)[i].view_size;
+	    while (p != this->mapping_symbols_info_.end() && p->first.first == i)
+	      {
+                typename Mapping_symbols_info::const_iterator next =
+                this->mapping_symbols_info_.upper_bound(p->first);
+ 
+                // Only swap arm code.
+                if (p->second == 'a') 
+		  {
+		    Output_section* os = this->output_section(i);
+		    gold_assert(os != NULL);
+		    Arm_address section_address = 
+		      this->simple_input_section_output_address(i, os);
+		    span_start = convert_to_section_size_type(p->first.second);
+		    if (next != this->mapping_symbols_info_.end() 
+		        && next->first.first == i)
+                      span_end = convert_to_section_size_type(next->first.second);
+                    else
+                      span_end = convert_to_section_size_type(shdr.get_sh_size());
+		    unsigned char* section_view = 
+		      view + (section_address - view_address);
+	  	    uint64_t section_size = this->section_size(i);
+
+	  	    gold_assert(section_address >= view_address
+		  	        && ((section_address + section_size)
+			        <= (view_address + view_size)));
+
+		    // Set Output view for swapping
+		    unsigned char *oview = section_view + span_start;
+		    unsigned int index = 0;
+ 		    while (index + 3 < (span_end - span_start)) 
+		      {
+		        typedef typename elfcpp::Swap<32, big_endian>::Valtype Valtype;
+		        Valtype* wv = reinterpret_cast<Valtype*>(oview+index);
+		        uint32_t val = elfcpp::Swap<32, false>::readval(wv);
+		        elfcpp::Swap<32, true>::writeval(wv, val);
+		        index += 4;
+		       }
+	          } 
+	        p = next;		
+	      }
+	  }
     }
 }
 
@@ -7785,9 +7839,16 @@ Output_data_plt_arm_standard<big_endian>::do_fill_first_plt_entry(
   const size_t num_first_plt_words = (sizeof(first_plt_entry)
 				      / sizeof(first_plt_entry[0]));
   for (size_t i = 0; i < num_first_plt_words - 1; i++)
-    elfcpp::Swap<32, big_endian>::writeval(pov + i * 4, first_plt_entry[i]);
+    if (parameters->options().user_set_be8())
+      elfcpp::Swap<32, false>::writeval(pov + i * 4, first_plt_entry[i]);
+    else
+      elfcpp::Swap<32, big_endian>::writeval(pov + i * 4, first_plt_entry[i]);
   // Last word in first PLT entry is &GOT[0] - .
-  elfcpp::Swap<32, big_endian>::writeval(pov + 16,
+  if (parameters->options().user_set_be8())
+    elfcpp::Swap<32, false>::writeval(pov + 16,
+					 got_address - (plt_address + 16));
+  else
+    elfcpp::Swap<32, big_endian>::writeval(pov + 16,
 					 got_address - (plt_address + 16));
 }
 
@@ -7846,11 +7907,20 @@ Output_data_plt_arm_short<big_endian>::do_fill_plt_entry(
     gold_error(_("PLT offset too large, try linking with --long-plt"));
 
   uint32_t plt_insn0 = plt_entry[0] | ((offset >> 20) & 0xff);
-  elfcpp::Swap<32, big_endian>::writeval(pov, plt_insn0);
   uint32_t plt_insn1 = plt_entry[1] | ((offset >> 12) & 0xff);
-  elfcpp::Swap<32, big_endian>::writeval(pov + 4, plt_insn1);
   uint32_t plt_insn2 = plt_entry[2] | (offset & 0xfff);
-  elfcpp::Swap<32, big_endian>::writeval(pov + 8, plt_insn2);
+  if (parameters->options().user_set_be8())
+    { 
+      elfcpp::Swap<32, false>::writeval(pov, plt_insn0);
+      elfcpp::Swap<32, false>::writeval(pov + 4, plt_insn1);
+      elfcpp::Swap<32, false>::writeval(pov + 8, plt_insn2);
+    }
+  else
+    {
+      elfcpp::Swap<32, big_endian>::writeval(pov, plt_insn0);
+      elfcpp::Swap<32, big_endian>::writeval(pov + 4, plt_insn1);
+      elfcpp::Swap<32, big_endian>::writeval(pov + 8, plt_insn2);
+    }
 }
 
 // This class generates long (16-byte) entries, for arbitrary displacements.
@@ -7906,13 +7976,23 @@ Output_data_plt_arm_long<big_endian>::do_fill_plt_entry(
 		    - (plt_address + plt_offset + 8));
 
   uint32_t plt_insn0 = plt_entry[0] | (offset >> 28);
-  elfcpp::Swap<32, big_endian>::writeval(pov, plt_insn0);
   uint32_t plt_insn1 = plt_entry[1] | ((offset >> 20) & 0xff);
-  elfcpp::Swap<32, big_endian>::writeval(pov + 4, plt_insn1);
   uint32_t plt_insn2 = plt_entry[2] | ((offset >> 12) & 0xff);
-  elfcpp::Swap<32, big_endian>::writeval(pov + 8, plt_insn2);
   uint32_t plt_insn3 = plt_entry[3] | (offset & 0xfff);
-  elfcpp::Swap<32, big_endian>::writeval(pov + 12, plt_insn3);
+  if (parameters->options().user_set_be8())
+    {
+      elfcpp::Swap<32, false>::writeval(pov, plt_insn0);
+      elfcpp::Swap<32, false>::writeval(pov + 4, plt_insn1);
+      elfcpp::Swap<32, false>::writeval(pov + 8, plt_insn2);
+      elfcpp::Swap<32, false>::writeval(pov + 12, plt_insn3);
+    }
+  else
+    {
+      elfcpp::Swap<32, big_endian>::writeval(pov, plt_insn0);
+      elfcpp::Swap<32, big_endian>::writeval(pov + 4, plt_insn1);
+      elfcpp::Swap<32, big_endian>::writeval(pov + 8, plt_insn2);
+      elfcpp::Swap<32, big_endian>::writeval(pov + 12, plt_insn3);
+    }
 }
 
 // Write out the PLT.  This uses the hand-coded instructions above,
@@ -10683,7 +10763,14 @@ Target_arm<big_endian>::do_adjust_elf_header(
     e_ident[elfcpp::EI_OSABI] = 0;
   e_ident[elfcpp::EI_ABIVERSION] = 0;
 
-  // FIXME: Do EF_ARM_BE8 adjustment.
+  // Do EF_ARM_BE8 adjustment.
+  if (parameters->options().user_set_be8() && !big_endian)
+    gold_error("BE8 images only valid in big-endian mode.");
+  if (parameters->options().user_set_be8())
+    {
+      flags |= elfcpp::EF_ARM_BE8;
+      this->set_processor_specific_flags(flags);
+    }
 
   // If we're working in EABI_VER5, set the hard/soft float ABI flags
   // as appropriate.
diff --git a/gold/options.h b/gold/options.h
index 23c9658..7260c41 100644
--- a/gold/options.h
+++ b/gold/options.h
@@ -674,6 +674,9 @@ class General_options
   DEFINE_bool_alias(dn, Bdynamic, options::ONE_DASH, '\0',
 		    N_("alias for -Bstatic"), NULL, true);
 
+  DEFINE_bool(be8,options::TWO_DASHES, '\0', false,
+              N_("(ARM only) be8 -byte invariant addressing."), NULL);
+
   DEFINE_bool(Bgroup, options::ONE_DASH, '\0', false,
 	      N_("Use group name lookup rules for shared library"), NULL);
 

^ permalink raw reply	[flat|nested] 17+ messages in thread
* Re: [Patch][Gold] BE8 for ARM
@ 2016-08-09  9:25 Umesh Kalappa
  2016-08-12  5:35 ` Sriraman Tallam
  0 siblings, 1 reply; 17+ messages in thread
From: Umesh Kalappa @ 2016-08-09  9:25 UTC (permalink / raw)
  To: Bharathi Seshadri (bseshadr), Doug Kwan, Sriraman Tallam
  Cc: binutils, ccoutant

Hi Doug /Sriram.

Any inputs/suggestions  here ,will be appreciated .

Thank you
~Umesh

On Fri, Jul 8, 2016 at 4:55 AM, Bharathi Seshadri (bseshadr)
<bseshadr@cisco.com> wrote:
> Hi,
>
> This patch implements the BE8 support for ARM in the gold linker. It has been tested on a non-trivial large program (size ~120MB).
> Thanks to Cary Coutant for his initial review.
>
> gold/ChangeLog
> 2016-07-07  Bharathi Seshadri  <bseshadr@cisco.com>
>
>         * options.h (General_options): Add --be8 option.
>         * arm.cc (Arm_relobj::do_relocate_sections): Add code to swap for be8.
>           (Output_data_plt_arm_standard::do_fill_first_plt_entry): Likewise.
>           (Output_data_plt_arm_short::do_fill_plt_entry): Likewise.
>           (Output_data_plt_arm_long::do_fill_plt_entry): Likewise.
>           (Target_arm::do_adjust_elf_header): Do EF_ARM_BE8 adjustment.
>
> Regards,
> Bharathi

^ permalink raw reply	[flat|nested] 17+ messages in thread
* Re: [Patch][Gold] BE8 for ARM
@ 2017-09-13  6:25 Umesh Kalappa
  2017-09-20 22:30 ` Cary Coutant
  0 siblings, 1 reply; 17+ messages in thread
From: Umesh Kalappa @ 2017-09-13  6:25 UTC (permalink / raw)
  To: Cary Coutant
  Cc: Bharathi Seshadri (bseshadr), Richard Earnshaw (lists), binutils

Ping ,

Any comments or good to commit ?

Thank you
~Umesh

On Fri, Sep 8, 2017 at 4:57 PM, Umesh Kalappa <umesh.kalappa0@gmail.com> wrote:
> Hi Cary and everyone,
>
> Arm/thumb stubs support was missed in the be8 mode with the previous
> patch, hence adding the same with the unit cases.
>
> No Regress on gold test-suites.
>
> Please do needful by committing the same.
>
> Thank you
> ~Umesh
>
> On Wed, Aug 24, 2016 at 3:21 AM, Cary Coutant <ccoutant@gmail.com> wrote:
>>> Please find attached the BE8 patch that includes support for thumb as well.
>>> I tested it on a hello world and bzip2 example for both arm and thumb besides a large arm application (size ~120MB).
>>> No regressions with the gold test-suite for arm.
>>>
>>> gold/ChangeLog
>>> 2016-08-15  Bharathi Seshadri  <bseshadr@cisco.com>
>>>
>>>         * options.h (General_options): Add --be8 option.
>>>         * arm.cc (Arm_relobj::do_relocate_sections): Add code to swap for be8.
>>>           (Output_data_plt_arm_standard::do_fill_first_plt_entry): Likewise.
>>>           (Output_data_plt_arm_short::do_fill_plt_entry): Likewise.
>>>           (Output_data_plt_arm_long::do_fill_plt_entry): Likewise.
>>>           (Target_arm::do_adjust_elf_header): Do EF_ARM_BE8 adjustment.
>>
>> Committed. Thanks!
>>
>> -cary

^ permalink raw reply	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2017-10-26 15:06 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-07 23:25 [Patch][Gold] BE8 for ARM Bharathi Seshadri (bseshadr)
2016-08-09  9:57 ` Richard Earnshaw (lists)
2016-08-12 15:22   ` Cary Coutant
2016-08-12 15:36     ` Bharathi Seshadri (bseshadr)
2016-08-12 16:35       ` Cary Coutant
2016-08-15 18:05         ` Bharathi Seshadri (bseshadr)
2016-08-16 14:17           ` Richard Earnshaw (lists)
2016-08-23 21:52           ` Cary Coutant
2017-09-08 11:27             ` Umesh Kalappa
2016-08-09  9:25 Umesh Kalappa
2016-08-12  5:35 ` Sriraman Tallam
2017-09-13  6:25 Umesh Kalappa
2017-09-20 22:30 ` Cary Coutant
2017-09-25 10:58   ` Umesh Kalappa
2017-10-12  9:48     ` Umesh Kalappa
2017-10-20  4:00       ` Cary Coutant
     [not found]         ` <CAGfacvR9Q+n3ScPBUeqyuGuoNHzLTXBDsiUJC65mvwB7VcJpNw@mail.gmail.com>
2017-10-26 15:06           ` Umesh Kalappa

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).