1.1 --- a/src/share/vm/adlc/forms.cpp Thu Jun 14 14:59:52 2012 -0700
1.2 +++ b/src/share/vm/adlc/forms.cpp Fri Jun 15 01:25:19 2012 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -265,47 +265,22 @@
1.11 if( strcmp(opType,"LoadN")==0 ) return Form::idealN;
1.12 if( strcmp(opType,"LoadRange")==0 ) return Form::idealI;
1.13 if( strcmp(opType,"LoadS")==0 ) return Form::idealS;
1.14 - if( strcmp(opType,"Load16B")==0 ) return Form::idealB;
1.15 - if( strcmp(opType,"Load8B")==0 ) return Form::idealB;
1.16 - if( strcmp(opType,"Load4B")==0 ) return Form::idealB;
1.17 - if( strcmp(opType,"Load8C")==0 ) return Form::idealC;
1.18 - if( strcmp(opType,"Load4C")==0 ) return Form::idealC;
1.19 - if( strcmp(opType,"Load2C")==0 ) return Form::idealC;
1.20 - if( strcmp(opType,"Load8S")==0 ) return Form::idealS;
1.21 - if( strcmp(opType,"Load4S")==0 ) return Form::idealS;
1.22 - if( strcmp(opType,"Load2S")==0 ) return Form::idealS;
1.23 - if( strcmp(opType,"Load2D")==0 ) return Form::idealD;
1.24 - if( strcmp(opType,"Load4F")==0 ) return Form::idealF;
1.25 - if( strcmp(opType,"Load2F")==0 ) return Form::idealF;
1.26 - if( strcmp(opType,"Load4I")==0 ) return Form::idealI;
1.27 - if( strcmp(opType,"Load2I")==0 ) return Form::idealI;
1.28 - if( strcmp(opType,"Load2L")==0 ) return Form::idealL;
1.29 + if( strcmp(opType,"LoadVector")==0 ) return Form::idealV;
1.30 assert( strcmp(opType,"Load") != 0, "Must type Loads" );
1.31 return Form::none;
1.32 }
1.33
1.34 Form::DataType Form::is_store_to_memory(const char *opType) const {
1.35 if( strcmp(opType,"StoreB")==0) return Form::idealB;
1.36 - if( strcmp(opType,"StoreCM")==0) return Form::idealB;
1.37 + if( strcmp(opType,"StoreCM")==0) return Form::idealB;
1.38 if( strcmp(opType,"StoreC")==0) return Form::idealC;
1.39 if( strcmp(opType,"StoreD")==0) return Form::idealD;
1.40 if( strcmp(opType,"StoreF")==0) return Form::idealF;
1.41 if( strcmp(opType,"StoreI")==0) return Form::idealI;
1.42 if( strcmp(opType,"StoreL")==0) return Form::idealL;
1.43 if( strcmp(opType,"StoreP")==0) return Form::idealP;
1.44 - if( strcmp(opType,"StoreN")==0) return Form::idealN;
1.45 - if( strcmp(opType,"Store16B")==0) return Form::idealB;
1.46 - if( strcmp(opType,"Store8B")==0) return Form::idealB;
1.47 - if( strcmp(opType,"Store4B")==0) return Form::idealB;
1.48 - if( strcmp(opType,"Store8C")==0) return Form::idealC;
1.49 - if( strcmp(opType,"Store4C")==0) return Form::idealC;
1.50 - if( strcmp(opType,"Store2C")==0) return Form::idealC;
1.51 - if( strcmp(opType,"Store2D")==0) return Form::idealD;
1.52 - if( strcmp(opType,"Store4F")==0) return Form::idealF;
1.53 - if( strcmp(opType,"Store2F")==0) return Form::idealF;
1.54 - if( strcmp(opType,"Store4I")==0) return Form::idealI;
1.55 - if( strcmp(opType,"Store2I")==0) return Form::idealI;
1.56 - if( strcmp(opType,"Store2L")==0) return Form::idealL;
1.57 + if( strcmp(opType,"StoreN")==0) return Form::idealN;
1.58 + if( strcmp(opType,"StoreVector")==0 ) return Form::idealV;
1.59 assert( strcmp(opType,"Store") != 0, "Must type Stores" );
1.60 return Form::none;
1.61 }
