Skip to content

Commit b574fdb

Browse files
authored
Implement Ion 1.0 byte-array-backed bytecode generator (#1143)
1 parent 359db5a commit b574fdb

6 files changed

Lines changed: 1487 additions & 26 deletions

File tree

src/main/java/com/amazon/ion/bytecode/bin10/ByteArrayBytecodeGenerator10.kt

Lines changed: 414 additions & 5 deletions
Large diffs are not rendered by default.

src/main/java/com/amazon/ion/bytecode/bin10/TypeIdHelper.kt

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ internal object TypeIdHelper {
8080
in 0xA0..0xAF -> OperationKind.BLOB
8181
in 0xB0..0xBF -> OperationKind.LIST
8282
in 0xC0..0xCF -> OperationKind.SEXP
83-
0xD0, in 0xD2..0xDF -> OperationKind.STRUCT
83+
in 0xD0..0xDF -> OperationKind.STRUCT
8484
0xE0 -> OperationKind.IVM
8585
in 0xE3..0xEE -> OperationKind.ANNOTATIONS
8686
// Everything else: 12..1E, 30, D1, EF, F0..FF, illegal timestamp, float, and annotations sizes
87-
else -> OperationKind.UNSET
87+
else -> -1
8888
}
8989
}
9090

@@ -107,28 +107,31 @@ internal object TypeIdHelper {
107107
// The length of all of these is determined entirely by the low-nibble of the typeId.
108108
0x00, 0x10, 0x20, 0x30, 0x40, 0x50, /* */ 0x70, 0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0 /* */ -> 0
109109
0x01, /* */ 0x21, 0x31, /* */ 0x51, /* */ 0x71, 0x81, 0x91, 0xA1, 0xB1, 0xC1 /* */ /* */ -> 1
110-
0x02, 0x12, 0x22, 0x32, /* */ 0x52, 0x62, 0x72, 0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2 /* */ -> 2
111-
0x03, 0x13, 0x23, 0x33, /* */ 0x53, 0x63, 0x73, 0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3 -> 3
112-
0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74, 0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4 -> 4
113-
0x05, 0x15, 0x25, 0x35, /* */ 0x55, 0x65, 0x75, 0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5 -> 5
114-
0x06, 0x16, 0x26, 0x36, /* */ 0x56, 0x66, 0x76, 0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6 -> 6
115-
0x07, 0x17, 0x27, 0x37, /* */ 0x57, 0x67, 0x77, 0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7 -> 7
116-
0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78, 0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8 -> 8
117-
0x09, 0x19, 0x29, 0x39, /* */ 0x59, 0x69, 0x79, 0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9 -> 9
118-
0x0A, 0x1A, 0x2A, 0x3A, /* */ 0x5A, 0x6A, 0x7A, 0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA -> 10
119-
0x0B, 0x1B, 0x2B, 0x3B, /* */ 0x5B, 0x6B, 0x7B, 0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB -> 11
120-
0x0C, 0x1C, 0x2C, 0x3C, /* */ 0x5C, 0x6C, 0x7C, 0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC -> 12
121-
0x0D, 0x1D, 0x2D, 0x3D, /* */ 0x5D, 0x6D, 0x7D, 0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED -> 13
122-
0x0E, 0x1E, 0x2E, 0x3E, /* */ 0x5E, 0x6E, 0x7E, 0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE -> -1
110+
0x02, /* */ 0x22, 0x32, /* */ 0x52, 0x62, 0x72, 0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2 /* */ -> 2
111+
0x03, /* */ 0x23, 0x33, /* */ 0x53, 0x63, 0x73, 0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3 -> 3
112+
0x04, /* */ 0x24, 0x34, 0x44, 0x54, 0x64, 0x74, 0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4 -> 4
113+
0x05, /* */ 0x25, 0x35, /* */ 0x55, 0x65, 0x75, 0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5 -> 5
114+
0x06, /* */ 0x26, 0x36, /* */ 0x56, 0x66, 0x76, 0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6 -> 6
115+
0x07, /* */ 0x27, 0x37, /* */ 0x57, 0x67, 0x77, 0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7 -> 7
116+
0x08, /* */ 0x28, 0x38, 0x48, 0x58, 0x68, 0x78, 0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8 -> 8
117+
0x09, /* */ 0x29, 0x39, /* */ 0x59, 0x69, 0x79, 0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9 -> 9
118+
0x0A, /* */ 0x2A, 0x3A, /* */ 0x5A, 0x6A, 0x7A, 0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA -> 10
119+
0x0B, /* */ 0x2B, 0x3B, /* */ 0x5B, 0x6B, 0x7B, 0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB -> 11
120+
0x0C, /* */ 0x2C, 0x3C, /* */ 0x5C, 0x6C, 0x7C, 0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC -> 12
121+
0x0D, /* */ 0x2D, 0x3D, /* */ 0x5D, 0x6D, 0x7D, 0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED -> 13
122+
0x0E, /* */ 0x2E, 0x3E, /* */ 0x5E, 0x6E, 0x7E, 0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE -> -1
123123
// Bool True
124124
0x11 -> 0
125125
// Nulls
126126
0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F, 0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF -> 0
127127
// IVM
128128
0xE0 -> 3 // ...3 more than the typeId byte.
129+
// Sorted struct
130+
0xD1 -> -1
129131

130132
// Reserved and/or illegal typeIds
131-
0xEF, 0x60, 0x61, 0xD1, 0xE1, 0xE2,
133+
0xEF, 0x60, 0x61, 0xE1, 0xE2,
134+
in 0x12..0x1E,
132135
in 0x41..0x4E, // Illegal float lengths. 0x44 and 0x48 are trapped in the earlier condition.
133136
in 0xF0..0xFF -> -2
134137
else -> TODO("This should be unreachable: ${typeId.toHexString()}")

src/main/java/com/amazon/ion/bytecode/bin10/ValueHelpers.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ internal fun readTimestampReference(valueBytes: ByteArray, position: Int, length
121121
* Reads a Decimal value from the given byte array.
122122
*/
123123
internal fun readDecimalReference(valueBytes: ByteArray, position: Int, end: Int): Decimal {
124+
if (position >= end) return Decimal.ZERO
124125
var p = position
125126
val exponentValueAndLength = VarIntHelper.readVarIntValueAndLength(valueBytes, p)
126127
p += exponentValueAndLength.toInt() and 0xFF

src/test/java/com/amazon/ion/bytecode/GeneratorTestUtil.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import org.junit.jupiter.api.assertThrows
1414

1515
object GeneratorTestUtil {
1616

17+
internal fun BytecodeGenerator.shouldGenerate(vararg expectedBytecode: Int) = shouldGenerate(expectedBytecode)
18+
1719
internal fun BytecodeGenerator.shouldGenerate(
1820
expectedBytecode: IntArray,
1921
expectedConstantPool: ConstantPool? = null,
@@ -23,7 +25,7 @@ object GeneratorTestUtil {
2325

2426
val generator = this
2527

26-
val outputBytecode = BytecodeBuffer()
28+
val outputBytecode = BytecodeBuffer(256)
2729
val constantPool = ConstantPool(32)
2830

2931
val macroIndices = mutableListOf(0)

0 commit comments

Comments
 (0)