xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: mattjd@gmail.com, Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [PATCH 04/16] libelf: abolish elf_sval and elf_access_signed
Date: Mon, 3 Jun 2013 16:41:39 +0100	[thread overview]
Message-ID: <1370274111-18377-5-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1370274111-18377-1-git-send-email-ian.jackson@eu.citrix.com>

These are not used anywhere.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
 xen/common/libelf/libelf-tools.c |   28 ----------------------------
 xen/include/xen/libelf.h         |   11 -----------
 2 files changed, 0 insertions(+), 39 deletions(-)

diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c
index 8312065..1f08407 100644
--- a/xen/common/libelf/libelf-tools.c
+++ b/xen/common/libelf/libelf-tools.c
@@ -48,34 +48,6 @@ uint64_t elf_access_unsigned(struct elf_binary * elf, const void *ptr,
     }
 }
 
-int64_t elf_access_signed(struct elf_binary *elf, const void *ptr,
-                          uint64_t offset, size_t size)
-{
-    int need_swap = elf_swap(elf);
-    const int8_t *s8;
-    const int16_t *s16;
-    const int32_t *s32;
-    const int64_t *s64;
-
-    switch ( size )
-    {
-    case 1:
-        s8 = ptr + offset;
-        return *s8;
-    case 2:
-        s16 = ptr + offset;
-        return need_swap ? bswap_16(*s16) : *s16;
-    case 4:
-        s32 = ptr + offset;
-        return need_swap ? bswap_32(*s32) : *s32;
-    case 8:
-        s64 = ptr + offset;
-        return need_swap ? bswap_64(*s64) : *s64;
-    default:
-        return 0;
-    }
-}
-
 uint64_t elf_round_up(struct elf_binary *elf, uint64_t addr)
 {
     int elf_round = (elf_64bit(elf) ? 8 : 4) - 1;
diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h
index 218bb18..ae03982 100644
--- a/xen/include/xen/libelf.h
+++ b/xen/include/xen/libelf.h
@@ -136,23 +136,12 @@ struct elf_binary {
                            offsetof(typeof(*(str)),e32.elem),           \
                            sizeof((str)->e32.elem)))
 
-#define elf_sval(elf, str, elem)                                        \
-    ((ELFCLASS64 == (elf)->class)                                       \
-     ? elf_access_signed((elf), (str),                                  \
-                         offsetof(typeof(*(str)),e64.elem),             \
-                         sizeof((str)->e64.elem))                       \
-     : elf_access_signed((elf), (str),                                  \
-                         offsetof(typeof(*(str)),e32.elem),             \
-                         sizeof((str)->e32.elem)))
-
 #define elf_size(elf, str)                              \
     ((ELFCLASS64 == (elf)->class)                       \
      ? sizeof((str)->e64) : sizeof((str)->e32))
 
 uint64_t elf_access_unsigned(struct elf_binary *elf, const void *ptr,
                              uint64_t offset, size_t size);
-int64_t elf_access_signed(struct elf_binary *elf, const void *ptr,
-                          uint64_t offset, size_t size);
 
 uint64_t elf_round_up(struct elf_binary *elf, uint64_t addr);
 
-- 
1.7.2.5

  parent reply	other threads:[~2013-06-03 15:41 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-03 15:41 [PATCH v3.1 00/16] XSA55 libelf fixes for unstable Ian Jackson
2013-06-03 15:41 ` [PATCH 01/16] libelf: abolish libelf-relocate.c Ian Jackson
2013-06-03 15:41 ` [PATCH 02/16] libxc: introduce xc_dom_seg_to_ptr_pages Ian Jackson
2013-06-03 15:41 ` [PATCH 03/16] libelf: add `struct elf_binary*' parameter to elf_load_image Ian Jackson
2013-06-03 15:41 ` Ian Jackson [this message]
2013-06-03 15:41 ` [PATCH 05/16] libelf: move include of <asm/guest_access.h> to top of file Ian Jackson
2013-06-03 15:41 ` [PATCH 06/16] libelf/xc_dom_load_elf_symtab: Do not use "syms" uninitialised Ian Jackson
2013-06-03 15:41 ` [PATCH 07/16] libelf: introduce macros for memory access and pointer handling Ian Jackson
2013-06-03 15:41 ` [PATCH 08/16] tools/xcutils/readnotes: adjust print_l1_mfn_valid_note Ian Jackson
2013-06-03 15:41 ` [PATCH 09/16] libelf: check nul-terminated strings properly Ian Jackson
2013-06-04 14:49   ` Matthew Daley
2013-06-04 15:15     ` Ian Jackson
2013-06-04 15:27       ` Matthew Daley
2013-06-04 17:13         ` Ian Jackson
2013-06-05  2:08           ` Matthew Daley
2013-06-05  7:24           ` Ian Campbell
2013-06-03 15:41 ` [PATCH 10/16] libelf: check all pointer accesses Ian Jackson
2013-06-04 14:55   ` Matthew Daley
2013-06-04 15:11     ` Ian Jackson
2013-06-03 15:41 ` [PATCH 11/16] libelf: Check pointer references in elf_is_elfbinary Ian Jackson
2013-06-03 15:41 ` [PATCH 12/16] libelf: Make all callers call elf_check_broken Ian Jackson
2013-06-03 15:41 ` [PATCH 13/16] libelf: use C99 bool for booleans Ian Jackson
2013-06-03 15:41 ` [PATCH 14/16] libelf: use only unsigned integers Ian Jackson
2013-06-04 10:50   ` Ian Jackson
2013-06-03 15:41 ` [PATCH 15/16] libelf: check loops for running away Ian Jackson
2013-06-03 15:41 ` [PATCH 16/16] libelf: abolish obsolete macros Ian Jackson
2013-06-03 16:08 ` [PATCH v3.1 00/16] XSA55 libelf fixes for unstable Ian Jackson
  -- strict thread matches above, loose matches on Subject: below --
2013-06-04 17:59 [PATCH 4 " Ian Jackson
2013-06-04 17:59 ` [PATCH 04/16] libelf: abolish elf_sval and elf_access_signed Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370274111-18377-5-git-send-email-ian.jackson@eu.citrix.com \
    --to=ian.jackson@eu.citrix.com \
    --cc=mattjd@gmail.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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 NNTP newsgroup(s).