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

Merge remote-tracking branch 'origin/master' into no_std

Browse Source
This commit is contained in:
Dan Gohman
2018-03-12 13:06:47 -07:00
parent 4a3077d638 2b9229d715
commit f9b9b4b8a4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cretonne/meta/gen_instr.py
View File

@@ -211,7 +211,8 @@ def gen_instruction_data_impl(fmt):
if f.has_value_list: if f.has_value_list:
fmt.line(n + ' { ref mut args, .. } => args,') fmt.line(n + ' { ref mut args, .. } => args,')
fmt.line('_ => panic!("No value list: {:?}", self),') fmt.line('_ => panic!("No value list: {:?}", self),')
fmt.line('debug_assert!(args.is_empty(), "Value list already in use");') fmt.line(
'debug_assert!(args.is_empty(), "Value list already in use");')
fmt.line('*args = vlist;') fmt.line('*args = vlist;')

3
lib/cretonne/meta/gen_settings.py
View File

@@ -245,7 +245,8 @@ def gen_constructor(sgrp, parent, fmt):
'pub fn new({}) -> Flags {{'.format(args), '}'): 'pub fn new({}) -> Flags {{'.format(args), '}'):
fmt.line('let bvec = builder.state_for("{}");'.format(sgrp.name)) fmt.line('let bvec = builder.state_for("{}");'.format(sgrp.name))
fmt.line('let mut bytes = [0; {}];'.format(sgrp.byte_size())) fmt.line('let mut bytes = [0; {}];'.format(sgrp.byte_size()))
fmt.line('debug_assert_eq!(bvec.len(), {});'.format(sgrp.settings_size)) fmt.line(
'debug_assert_eq!(bvec.len(), {});'.format(sgrp.settings_size))
with fmt.indented( with fmt.indented(
'for (i, b) in bvec.iter().enumerate() {', '}'): 'for (i, b) in bvec.iter().enumerate() {', '}'):
fmt.line('bytes[i] = *b;') fmt.line('bytes[i] = *b;')