Return a function pointer from TargetIsa::encode().
Replace the isa::Legalize enumeration with a function pointer. This allows an ISA to define its own specific legalization actions instead of relying on the default two. Generate a LEGALIZE_ACTIONS table for each ISA which contains legalization function pointers indexed by the legalization codes that are already in the encoding tables. Include this table in isa/*/enc_tables.rs. Give the `Encodings` iterator a reference to the action table and change its `legalize()` method to return a function pointer instead of an ISA-specific code. The Result<> returned from TargetIsa::encode() no longer implements Debug, so eliminate uses of unwrap and expect on that type.
This commit is contained in:
@@ -479,9 +479,10 @@ impl<'a> Context<'a> {
|
||||
self.func.dfg.display_inst(pred_inst, self.isa));
|
||||
|
||||
// Give it an encoding.
|
||||
let encoding = self.isa
|
||||
.encode(&self.func.dfg, &self.func.dfg[inst], ty)
|
||||
.expect("Can't encode copy");
|
||||
let encoding = match self.isa.encode(&self.func.dfg, &self.func.dfg[inst], ty) {
|
||||
Ok(e) => e,
|
||||
Err(_) => panic!("Can't encode copy.{}", ty),
|
||||
};
|
||||
*self.func.encodings.ensure(inst) = encoding;
|
||||
|
||||
// Create a live range for the new value.
|
||||
@@ -525,9 +526,10 @@ impl<'a> Context<'a> {
|
||||
ty);
|
||||
|
||||
// Give it an encoding.
|
||||
let encoding = self.isa
|
||||
.encode(&self.func.dfg, &self.func.dfg[inst], ty)
|
||||
.expect("Can't encode copy");
|
||||
let encoding = match self.isa.encode(&self.func.dfg, &self.func.dfg[inst], ty) {
|
||||
Ok(e) => e,
|
||||
Err(_) => panic!("Can't encode copy.{}", ty),
|
||||
};
|
||||
*self.func.encodings.ensure(inst) = encoding;
|
||||
|
||||
// Create a live range for the new value.
|
||||
|
||||
Reference in New Issue
Block a user