T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move second_result outside boxed storage.

Browse Source 
In instruction formats that have multiple results AND boxed storage,
place the second_result field outside the boxed storage. The 16-byte
instruction format has room for opcode, type, second_result in the first
8 bytes, and the boxed pointer in the last 8 bytes.

This provides a simpler implementation of the second_result() and
second_result_mut() InstructionData methods.
This commit is contained in:
Jakob Stoklund Olesen
2016-10-12 16:01:06 -07:00
parent 3ff28ed064
commit 93f79d7a48
3 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
meta/gen_instr.py
View File

@@ -87,23 +87,16 @@ def gen_instruction_data_impl(fmt):
'pub fn second_result(&self) -> Option<Value> {', '}'):
with fmt.indented('match *self {', '}'):
for f in cretonne.InstructionFormat.all_formats:
if not f.multiple_results:
# Single or no results.
fmt.line(
'InstructionData::{} {{ .. }} => None,'
.format(f.name))
elif f.boxed_storage:
# Multiple results, boxed storage.
fmt.line(
'InstructionData::' + f.name +
' { ref data, .. }' +
' => Some(data.second_result),')
else:
# Multiple results, inline storage.
if f.multiple_results:
fmt.line(
'InstructionData::' + f.name +
' { second_result, .. }' +
' => Some(second_result),')
else:
# Single or no results.
fmt.line(
'InstructionData::{} {{ .. }} => None,'
.format(f.name))
fmt.doc_comment('Mutable reference to second result value, if any.')
with fmt.indented(
@@ -111,23 +104,16 @@ def gen_instruction_data_impl(fmt):
" -> Option<&'a mut Value> {", '}'):
with fmt.indented('match *self {', '}'):
for f in cretonne.InstructionFormat.all_formats:
if not f.multiple_results:
# Single or no results.
fmt.line(
'InstructionData::{} {{ .. }} => None,'
.format(f.name))
elif f.boxed_storage:
# Multiple results, boxed storage.
fmt.line(
'InstructionData::' + f.name +
' { ref mut data, .. }' +
' => Some(&mut data.second_result),')
else:
# Multiple results, inline storage.
if f.multiple_results:
fmt.line(
'InstructionData::' + f.name +
' { ref mut second_result, .. }' +
' => Some(second_result),')
else:
# Single or no results.
fmt.line(
'InstructionData::{} {{ .. }} => None,'
.format(f.name))
fmt.doc_comment('Get the controlling type variable operand.')
with fmt.indented(