libgo: Update to Go 1.1.1.

From-SVN: r200974

1 files changed, 31 insertions, 17 deletions

diff --git a/libgo/go/debug/dwarf/unit.go b/libgo/go/debug/dwarf/unit.go
index b190320..8e09298 100644
--- a/libgo/go/debug/dwarf/unit.go
+++ b/libgo/go/debug/dwarf/unit.go
@@ -10,17 +10,31 @@ import "strconv"
 // Each unit has its own abbreviation table and address size.
 
 type unit struct {
-	base     Offset // byte offset of header within the aggregate info
-	off      Offset // byte offset of data within the aggregate info
-	lineoff  Offset // byte offset of data within the line info
-	data     []byte
-	atable   abbrevTable
-	addrsize int
-	version  int
-	dwarf64  bool // True for 64-bit DWARF format
-	dir      string
-	pc       []addrRange   // PC ranges in this compilation unit
-	lines    []mapLineInfo // PC -> line mapping
+	base    Offset // byte offset of header within the aggregate info
+	off     Offset // byte offset of data within the aggregate info
+	lineoff Offset // byte offset of data within the line info
+	data    []byte
+	atable  abbrevTable
+	asize   int
+	vers    int
+	is64    bool // True for 64-bit DWARF format
+	dir     string
+	pc      []addrRange   // PC ranges in this compilation unit
+	lines   []mapLineInfo // PC -> line mapping
+}
+
+// Implement the dataFormat interface.
+
+func (u *unit) version() int {
+	return u.vers
+}
+
+func (u *unit) dwarf64() (bool, bool) {
+	return u.is64, true
+}
+
+func (u *unit) addrsize() int {
+	return u.asize
 }
 
 // A range is an address range.
@@ -32,12 +46,12 @@ type addrRange struct {
 func (d *Data) parseUnits() ([]unit, error) {
 	// Count units.
 	nunit := 0
-	b := makeBuf(d, nil, "info", 0, d.info)
+	b := makeBuf(d, unknownFormat{}, "info", 0, d.info)
 	for len(b.data) > 0 {
 		len := b.uint32()
 		if len == 0xffffffff {
 			len64 := b.uint64()
-			if len64 != uint64(int(len64)) {
+			if len64 != uint64(uint32(len64)) {
 				b.error("unit length overflow")
 				break
 			}
@@ -51,14 +65,14 @@ func (d *Data) parseUnits() ([]unit, error) {
 	}
 
 	// Again, this time writing them down.
-	b = makeBuf(d, nil, "info", 0, d.info)
+	b = makeBuf(d, unknownFormat{}, "info", 0, d.info)
 	units := make([]unit, nunit)
 	for i := range units {
 		u := &units[i]
 		u.base = b.off
 		n := b.uint32()
 		if n == 0xffffffff {
-			u.dwarf64 = true
+			u.is64 = true
 			n = uint32(b.uint64())
 		}
 		vers := b.uint16()
@@ -66,6 +80,7 @@ func (d *Data) parseUnits() ([]unit, error) {
 			b.error("unsupported DWARF version " + strconv.Itoa(int(vers)))
 			break
 		}
+		u.vers = int(vers)
 		atable, err := d.parseAbbrev(b.uint32())
 		if err != nil {
 			if b.err == nil {
@@ -73,9 +88,8 @@ func (d *Data) parseUnits() ([]unit, error) {
 			}
 			break
 		}
-		u.version = int(vers)
 		u.atable = atable
-		u.addrsize = int(b.uint8())
+		u.asize = int(b.uint8())
 		u.off = b.off
 		u.data = b.bytes(int(n - (2 + 4 + 1)))
 	}