encoders for booleans and numbers.

R=rsc
DELTA=610  (597 added, 5 deleted, 8 changed)
OCL=30934
CL=30939

1 files changed, 352 insertions, 0 deletions

diff --git a/src/pkg/gob/codec_test.go b/src/pkg/gob/codec_test.go
index 9dca42a88..a35586e4a 100644
--- a/src/pkg/gob/codec_test.go
+++ b/src/pkg/gob/codec_test.go
@@ -9,6 +9,7 @@ import (
 	"gob";
 	"os";
 	"testing";
+	"unsafe";
 )
 
 // Guarantee encoding format by comparing some encodings to hand-written values
@@ -95,3 +96,354 @@ func TestIntCodec(t *testing.T) {
 	}
 	verifyInt(-1<<63, t);	// a tricky case
 }
+
+
+// The result of encoding three true booleans with field numbers 0, 1, 2
+var boolResult = []byte{0x80, 0x81, 0x81, 0x81, 0x82, 0x81}
+// The result of encoding three numbers = 17 with field numbers 0, 1, 2
+var signedResult = []byte{0x80, 0xa2, 0x81, 0xa2, 0x82, 0xa2}
+var unsignedResult = []byte{0x80, 0x91, 0x81, 0x91, 0x82, 0x91}
+var floatResult = []byte{0x80, 0x40, 0xe2, 0x81, 0x40, 0xe2, 0x82, 0x40, 0xe2}
+
+// Test instruction execution for encoding.
+// Do not run the machine yet; instead do individual instructions crafted by hand.
+func TestScalarEncInstructions(t *testing.T) {
+	var b = new(bytes.Buffer);
+	var state encState;
+
+	// bool
+	{
+		b.Reset();
+		v := true;
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a bool; b *bool; c **bool }){ v, pv, ppv };
+		instr := &encInstr{ encBool, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(boolResult, b.Data()) {
+			t.Errorf("bool enc instructions: expected % x got % x", boolResult, b.Data())
+		}
+	}
+
+	// int
+	{
+		b.Reset();
+		v := 17;
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a int; b *int; c **int }){ v, pv, ppv };
+		instr := &encInstr{ encInt, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(signedResult, b.Data()) {
+			t.Errorf("int enc instructions: expected % x got % x", signedResult, b.Data())
+		}
+	}
+
+	// uint
+	{
+		b.Reset();
+		v := uint(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a uint; b *uint; c **uint }){ v, pv, ppv };
+		instr := &encInstr{ encUint, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(unsignedResult, b.Data()) {
+			t.Errorf("uint enc instructions: expected % x got % x", unsignedResult, b.Data())
+		}
+	}
+
+	// int8
+	{
+		b.Reset();
+		v := int8(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a int8; b *int8; c **int8 }){ v, pv, ppv };
+		instr := &encInstr{ encInt, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(signedResult, b.Data()) {
+			t.Errorf("int8 enc instructions: expected % x got % x", signedResult, b.Data())
+		}
+	}
+
+	// uint8
+	{
+		b.Reset();
+		v := uint8(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a uint8; b *uint8; c **uint8 }){ v, pv, ppv };
+		instr := &encInstr{ encUint, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(unsignedResult, b.Data()) {
+			t.Errorf("uint8 enc instructions: expected % x got % x", unsignedResult, b.Data())
+		}
+	}
+
+	// int16
+	{
+		b.Reset();
+		v := int16(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a int16; b *int16; c **int16 }){ v, pv, ppv };
+		instr := &encInstr{ encInt16, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(signedResult, b.Data()) {
+			t.Errorf("int16 enc instructions: expected % x got % x", signedResult, b.Data())
+		}
+	}
+
+	// uint16
+	{
+		b.Reset();
+		v := uint16(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a uint16; b *uint16; c **uint16 }){ v, pv, ppv };
+		instr := &encInstr{ encUint16, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(unsignedResult, b.Data()) {
+			t.Errorf("uint16 enc instructions: expected % x got % x", unsignedResult, b.Data())
+		}
+	}
+
+	// int32
+	{
+		b.Reset();
+		v := int32(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a int32; b *int32; c **int32 }){ v, pv, ppv };
+		instr := &encInstr{ encInt32, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(signedResult, b.Data()) {
+			t.Errorf("int32 enc instructions: expected % x got % x", signedResult, b.Data())
+		}
+	}
+
+	// uint32
+	{
+		b.Reset();
+		v := uint32(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a uint32; b *uint32; c **uint32 }){ v, pv, ppv };
+		instr := &encInstr{ encUint32, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(unsignedResult, b.Data()) {
+			t.Errorf("uint32 enc instructions: expected % x got % x", unsignedResult, b.Data())
+		}
+	}
+
+	// int64
+	{
+		b.Reset();
+		v := int64(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a int64; b *int64; c **int64 }){ v, pv, ppv };
+		instr := &encInstr{ encInt64, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(signedResult, b.Data()) {
+			t.Errorf("int64 enc instructions: expected % x got % x", signedResult, b.Data())
+		}
+	}
+
+	// uint64
+	{
+		b.Reset();
+		v := uint64(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a uint64; b *uint64; c **uint64 }){ v, pv, ppv };
+		instr := &encInstr{ encUint, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(unsignedResult, b.Data()) {
+			t.Errorf("uint64 enc instructions: expected % x got % x", unsignedResult, b.Data())
+		}
+	}
+
+	// float
+	{
+		b.Reset();
+		v := float(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a float; b *float; c **float }){ v, pv, ppv };
+		instr := &encInstr{ encFloat, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(floatResult, b.Data()) {
+			t.Errorf("float enc instructions: expected % x got % x", floatResult, b.Data())
+		}
+	}
+
+	// float32
+	{
+		b.Reset();
+		v := float32(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a float32; b *float32; c **float32 }){ v, pv, ppv };
+		instr := &encInstr{ encFloat32, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(floatResult, b.Data()) {
+			t.Errorf("float32 enc instructions: expected % x got % x", floatResult, b.Data())
+		}
+	}
+
+	// float64
+	{
+		b.Reset();
+		v := float64(17);
+		pv := &v;
+		ppv := &pv;
+		data := (struct { a float64; b *float64; c **float64 }){ v, pv, ppv };
+		instr := &encInstr{ encFloat64, 0, 0, 0 };
+		state.w = b;
+		state.base = uintptr(unsafe.Pointer(&data));
+		instr.op(instr, &state);
+		instr.field = 1;
+		instr.indir = 1;
+		instr.offset = uintptr(unsafe.Offsetof(data.b));
+		instr.op(instr, &state);
+		instr.field = 2;
+		instr.indir = 2;
+		instr.offset = uintptr(unsafe.Offsetof(data.c));
+		instr.op(instr, &state);
+		if !bytes.Equal(floatResult, b.Data()) {
+			t.Errorf("float64 enc instructions: expected % x got % x", floatResult, b.Data())
+		}
+	}
+}