S390: Upstream changes from the past 2 weeks

src/s390/assembler-s390.cc

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // All Rights Reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
 // are met:
 //
 // - Redistributions of source code must retain the above copyright notice,
 // this list of conditions and the following disclaimer.
 //
@@ skipping 1786 matching lines @@
   rx_form(A, r1, opnd.rx(), opnd.rb(), opnd.offset());
 }
 
 // Add Register-Storage (32)
 void Assembler::ay(Register r1, const MemOperand& opnd) {
   rxy_form(AY, r1, opnd.rx(), opnd.rb(), opnd.offset());
 }
 
 // Add Immediate (32)
 void Assembler::afi(Register r1, const Operand& opnd) {
-  ril_form(ALFI, r1, opnd);
+  ril_form(AFI, r1, opnd);
 }
 
 // Add Halfword Register-Storage (32)
 void Assembler::ah(Register r1, const MemOperand& opnd) {
   rx_form(AH, r1, opnd.rx(), opnd.rb(), opnd.offset());
 }
 
 // Add Halfword Register-Storage (32)
 void Assembler::ahy(Register r1, const MemOperand& opnd) {
   rxy_form(AHY, r1, opnd.rx(), opnd.rb(), opnd.offset());
@@ skipping 95 matching lines @@
 // -------------------------------
 // 64-bit Add Logical Instructions
 // -------------------------------
 // Add Logical Register-Storage (64)
 void Assembler::alg(Register r1, const MemOperand& opnd) {
   rxy_form(ALG, r1, opnd.rx(), opnd.rb(), opnd.offset());
 }
 
 // Add Logical Immediate (64)
 void Assembler::algfi(Register r1, const Operand& opnd) {
-  ril_form(ALFI, r1, opnd);
+  ril_form(ALGFI, r1, opnd);
 }
 
 // Add Logical Register-Register (64)
 void Assembler::algr(Register r1, Register r2) { rre_form(ALGR, r1, r2); }
 
 // Add Logical Register-Register-Register (64)
 void Assembler::algrk(Register r1, Register r2, Register r3) {
   rrf1_form(ALGRK, r1, r2, r3);
 }
 
@@ skipping 1091 matching lines @@
 
     reloc_info_writer.Write(&rinfo);
   }
 
   reloc_info_writer.Finish();
 }
 
 }  // namespace internal
 }  // namespace v8
 #endif  // V8_TARGET_ARCH_S390