Removed the Opcode::NotAnOpcode variant, replaced its uses with Option<Opcode>, and used the NonZero optimization to maintain the small 1-byte size of an optional Opcode.

2017-02-22 16:13:48 +00:00
parent 3d0240d244
commit a4e4776087
6 changed files with 30 additions and 32 deletions
--- a/lib/cretonne/meta/gen_encoding.py
+++ b/lib/cretonne/meta/gen_encoding.py
@@ -364,12 +364,12 @@ def emit_level2_hashtables(level2_hashtables, offt, level2_doc, fmt):
            if entry:
                fmt.line(
                        'Level2Entry ' +
-                        '{{ opcode: Opcode::{}, offset: {:#08x} }},'
+                        '{{ opcode: Some(Opcode::{}), offset: {:#08x} }},'
                        .format(entry.inst.camel_name, entry.offset))
            else:
                fmt.line(
                        'Level2Entry ' +
-                        '{ opcode: Opcode::NotAnOpcode, offset: 0 },')
+                        '{ opcode: None, offset: 0 },')


 def emit_level1_hashtable(cpumode, level1, offt, fmt):