comparison src/share/vm/c1/c1_LIRAssembler.cpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents c38f13903fdf 7eca5de9e0b6
children cefad50507d8
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 /* 1 /*
2 * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
72 default: 72 default:
73 ShouldNotReachHere(); 73 ShouldNotReachHere();
74 } 74 }
75 } else if (patch->id() == PatchingStub::load_klass_id) { 75 } else if (patch->id() == PatchingStub::load_klass_id) {
76 switch (code) { 76 switch (code) {
77 case Bytecodes::_putstatic:
78 case Bytecodes::_getstatic:
79 case Bytecodes::_new: 77 case Bytecodes::_new:
80 case Bytecodes::_anewarray: 78 case Bytecodes::_anewarray:
81 case Bytecodes::_multianewarray: 79 case Bytecodes::_multianewarray:
82 case Bytecodes::_instanceof: 80 case Bytecodes::_instanceof:
83 case Bytecodes::_checkcast: 81 case Bytecodes::_checkcast:
82 break;
83 default:
84 ShouldNotReachHere();
85 }
86 } else if (patch->id() == PatchingStub::load_mirror_id) {
87 switch (code) {
88 case Bytecodes::_putstatic:
89 case Bytecodes::_getstatic:
84 case Bytecodes::_ldc: 90 case Bytecodes::_ldc:
85 case Bytecodes::_ldc_w: 91 case Bytecodes::_ldc_w:
86 break; 92 break;
87 default: 93 default:
88 ShouldNotReachHere(); 94 ShouldNotReachHere();
766 772
767 case lir_throw: 773 case lir_throw:
768 throw_op(op->in_opr1(), op->in_opr2(), op->info()); 774 throw_op(op->in_opr1(), op->in_opr2(), op->info());
769 break; 775 break;
770 776
777 case lir_xadd:
778 case lir_xchg:
779 atomic_op(op->code(), op->in_opr1(), op->in_opr2(), op->result_opr(), op->tmp1_opr());
780 break;
781
771 default: 782 default:
772 Unimplemented(); 783 Unimplemented();
773 break; 784 break;
774 } 785 }
775 } 786 }