cbfs: fix issues with word size and endianness.

Add XDR functions and use them to convert the ELF headers
to native headers, using the Elf64 structs to ensure we accomodate
all word sizes. Also, use these XDR functions for output.

This may seem overly complex but it turned out to be much the easiest
way to do this. Note that the basic elf parsing function
in cbfs-mkstage.c now works over all ELF files, for all architectures,
endian, and word size combinations. At the same time, the basic elf
parsing in cbfs-mkstage.c is a loop that has no architecture-specific
conditionals.

Add -g to the LDFLAGS while we're here. It's on the CFLAGS so there is
no harm done.

This code has been tested on all chromebooks that use coreboot to date.

I added most of the extra checks from ChromeOS and they triggered a
lot of warnings, hence the other changes. I had to take -Wshadow back
out due to the many errors it triggers in LZMA.

BUG=None
TEST=Build and boot for Peppy; works fine. Build and boot for nyan,
     works fine. Build for qemu targets and armv8 targets.
BRANCH=None

Change-Id: I5a4cee9854799189115ac701e22efc406a8d902f
Signed-off-by: Ronald G. Minnich <rminnich@google.com>
Reviewed-on: https://chromium-review.googlesource.com/178606
Reviewed-by: Ronald Minnich <rminnich@chromium.org>
Commit-Queue: Ronald Minnich <rminnich@chromium.org>
Tested-by: Ronald Minnich <rminnich@chromium.org>
Reviewed-on: http://review.coreboot.org/4817
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

1 files changed, 140 insertions, 0 deletions

diff --git a/util/cbfstool/xdr.c b/util/cbfstool/xdr.c
new file mode 100644
index 0000000000..d779675cd5
--- /dev/null
+++ b/util/cbfstool/xdr.c
@@ -0,0 +1,140 @@
+ /*
+ * cbfstool, CLI utility for CBFS file manipulation
+ *
+ * Copyright 2013 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <stdint.h>
+#include "common.h"
+
+/* The assumption in all this code is that we're given a pointer to enough data.
+ * Hence, we do not check for underflow.
+ */
+static uint8_t get8(struct buffer *input)
+{
+	uint8_t ret = *input->data++;
+	input->size--;
+	return ret;
+}
+
+static uint16_t get16be(struct buffer *input)
+{
+	uint16_t ret;
+	ret = get8(input) << 8;
+	ret |= get8(input);
+	return ret;
+}
+
+static uint32_t get32be(struct buffer *input)
+{
+	uint32_t ret;
+	ret = get16be(input) << 16;
+	ret |= get16be(input);
+	return ret;
+}
+
+static uint64_t get64be(struct buffer *input)
+{
+	uint64_t ret;
+	ret = get32be(input);
+	ret <<= 32;
+	ret |= get32be(input);
+	return ret;
+}
+
+static void put8(struct buffer *input, uint8_t val)
+{
+	input->data[input->size] = val;
+	input->size++;
+}
+
+static void put16be(struct buffer *input, uint16_t val)
+{
+	put8(input, val >> 8);
+	put8(input, val);
+}
+
+static void put32be(struct buffer *input, uint32_t val)
+{
+	put16be(input, val >> 16);
+	put16be(input, val);
+}
+
+static void put64be(struct buffer *input, uint64_t val)
+{
+	put32be(input, val >> 32);
+	put32be(input, val);
+}
+
+static uint16_t get16le(struct buffer *input)
+{
+	uint16_t ret;
+	ret = get8(input);
+	ret |= get8(input) << 8;
+	return ret;
+}
+
+static uint32_t get32le(struct buffer *input)
+{
+	uint32_t ret;
+	ret = get16le(input);
+	ret |= get16le(input) << 16;
+	return ret;
+}
+
+static uint64_t get64le(struct buffer *input)
+{
+	uint64_t ret;
+	uint32_t low;
+	low = get32le(input);
+	ret = get32le(input);
+	ret <<= 32;
+	ret |= low;
+	return ret;
+}
+
+static void put16le(struct buffer *input, uint16_t val)
+{
+	put8(input, val);
+	put8(input, val >> 8);
+}
+
+static void put32le(struct buffer *input, uint32_t val)
+{
+	put16le(input, val);
+	put16le(input, val >> 16);
+}
+
+static void put64le(struct buffer *input, uint64_t val)
+{
+	put32le(input, val);
+	put32le(input, val >> 32);
+}
+
+struct xdr xdr_be = {
+	get16be, get32be, get64be,
+	put16be, put32be, put64be
+};
+
+struct xdr xdr_le = {
+	get16le, get32le, get64le,
+	put16le, put32le, put64le
+};