1.1 --- a/src/cpu/sparc/vm/assembler_sparc.inline.hpp Thu Mar 19 09:13:24 2009 -0700
1.2 +++ b/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Mar 20 23:19:36 2009 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
1.6 + * Copyright 1997-2009 Sun Microsystems, Inc. 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 @@ -143,45 +143,45 @@
1.11 inline void Assembler::ld( Register s1, int simm13a, Register d) { lduw( s1, simm13a, d); }
1.12 #endif
1.13
1.14 -inline void Assembler::ldub( Register s1, RegisterConstant s2, Register d) {
1.15 +inline void Assembler::ldub( Register s1, RegisterOrConstant s2, Register d) {
1.16 if (s2.is_register()) ldsb(s1, s2.as_register(), d);
1.17 else ldsb(s1, s2.as_constant(), d);
1.18 }
1.19 -inline void Assembler::ldsb( Register s1, RegisterConstant s2, Register d) {
1.20 +inline void Assembler::ldsb( Register s1, RegisterOrConstant s2, Register d) {
1.21 if (s2.is_register()) ldsb(s1, s2.as_register(), d);
1.22 else ldsb(s1, s2.as_constant(), d);
1.23 }
1.24 -inline void Assembler::lduh( Register s1, RegisterConstant s2, Register d) {
1.25 +inline void Assembler::lduh( Register s1, RegisterOrConstant s2, Register d) {
1.26 if (s2.is_register()) ldsh(s1, s2.as_register(), d);
1.27 else ldsh(s1, s2.as_constant(), d);
1.28 }
1.29 -inline void Assembler::ldsh( Register s1, RegisterConstant s2, Register d) {
1.30 +inline void Assembler::ldsh( Register s1, RegisterOrConstant s2, Register d) {
1.31 if (s2.is_register()) ldsh(s1, s2.as_register(), d);
1.32 else ldsh(s1, s2.as_constant(), d);
1.33 }
1.34 -inline void Assembler::lduw( Register s1, RegisterConstant s2, Register d) {
1.35 +inline void Assembler::lduw( Register s1, RegisterOrConstant s2, Register d) {
1.36 if (s2.is_register()) ldsw(s1, s2.as_register(), d);
1.37 else ldsw(s1, s2.as_constant(), d);
1.38 }
1.39 -inline void Assembler::ldsw( Register s1, RegisterConstant s2, Register d) {
1.40 +inline void Assembler::ldsw( Register s1, RegisterOrConstant s2, Register d) {
1.41 if (s2.is_register()) ldsw(s1, s2.as_register(), d);
1.42 else ldsw(s1, s2.as_constant(), d);
1.43 }
1.44 -inline void Assembler::ldx( Register s1, RegisterConstant s2, Register d) {
1.45 +inline void Assembler::ldx( Register s1, RegisterOrConstant s2, Register d) {
1.46 if (s2.is_register()) ldx(s1, s2.as_register(), d);
1.47 else ldx(s1, s2.as_constant(), d);
1.48 }
1.49 -inline void Assembler::ld( Register s1, RegisterConstant s2, Register d) {
1.50 +inline void Assembler::ld( Register s1, RegisterOrConstant s2, Register d) {
1.51 if (s2.is_register()) ld(s1, s2.as_register(), d);
1.52 else ld(s1, s2.as_constant(), d);
1.53 }
1.54 -inline void Assembler::ldd( Register s1, RegisterConstant s2, Register d) {
1.55 +inline void Assembler::ldd( Register s1, RegisterOrConstant s2, Register d) {
1.56 if (s2.is_register()) ldd(s1, s2.as_register(), d);
1.57 else ldd(s1, s2.as_constant(), d);
1.58 }
1.59
1.60 // form effective addresses this way:
1.61 -inline void Assembler::add( Register s1, RegisterConstant s2, Register d, int offset) {
1.62 +inline void Assembler::add( Register s1, RegisterOrConstant s2, Register d, int offset) {
1.63 if (s2.is_register()) add(s1, s2.as_register(), d);
1.64 else { add(s1, s2.as_constant() + offset, d); offset = 0; }
1.65 if (offset != 0) add(d, offset, d);
1.66 @@ -243,23 +243,23 @@
1.67 inline void Assembler::st( Register d, Register s1, Register s2) { stw(d, s1, s2); }
1.68 inline void Assembler::st( Register d, Register s1, int simm13a) { stw(d, s1, simm13a); }
1.69
1.70 -inline void Assembler::stb( Register d, Register s1, RegisterConstant s2) {
1.71 +inline void Assembler::stb( Register d, Register s1, RegisterOrConstant s2) {
1.72 if (s2.is_register()) stb(d, s1, s2.as_register());
1.73 else stb(d, s1, s2.as_constant());
1.74 }
1.75 -inline void Assembler::sth( Register d, Register s1, RegisterConstant s2) {
1.76 +inline void Assembler::sth( Register d, Register s1, RegisterOrConstant s2) {
1.77 if (s2.is_register()) sth(d, s1, s2.as_register());
1.78 else sth(d, s1, s2.as_constant());
1.79 }
1.80 -inline void Assembler::stx( Register d, Register s1, RegisterConstant s2) {
1.81 +inline void Assembler::stx( Register d, Register s1, RegisterOrConstant s2) {
1.82 if (s2.is_register()) stx(d, s1, s2.as_register());
1.83 else stx(d, s1, s2.as_constant());
1.84 }
1.85 -inline void Assembler::std( Register d, Register s1, RegisterConstant s2) {
1.86 +inline void Assembler::std( Register d, Register s1, RegisterOrConstant s2) {
1.87 if (s2.is_register()) std(d, s1, s2.as_register());
1.88 else std(d, s1, s2.as_constant());
1.89 }
1.90 -inline void Assembler::st( Register d, Register s1, RegisterConstant s2) {
1.91 +inline void Assembler::st( Register d, Register s1, RegisterOrConstant s2) {
1.92 if (s2.is_register()) st(d, s1, s2.as_register());
1.93 else st(d, s1, s2.as_constant());
1.94 }
1.95 @@ -308,7 +308,7 @@
1.96 #endif
1.97 }
1.98
1.99 -inline void MacroAssembler::ld_ptr( Register s1, RegisterConstant s2, Register d ) {
1.100 +inline void MacroAssembler::ld_ptr( Register s1, RegisterOrConstant s2, Register d ) {
1.101 #ifdef _LP64
1.102 Assembler::ldx( s1, s2, d);
1.103 #else
1.104 @@ -340,7 +340,7 @@
1.105 #endif
1.106 }
1.107
1.108 -inline void MacroAssembler::st_ptr( Register d, Register s1, RegisterConstant s2 ) {
1.109 +inline void MacroAssembler::st_ptr( Register d, Register s1, RegisterOrConstant s2 ) {
1.110 #ifdef _LP64
1.111 Assembler::stx( d, s1, s2);
1.112 #else
1.113 @@ -373,7 +373,7 @@
1.114 #endif
1.115 }
1.116
1.117 -inline void MacroAssembler::ld_long( Register s1, RegisterConstant s2, Register d ) {
1.118 +inline void MacroAssembler::ld_long( Register s1, RegisterOrConstant s2, Register d ) {
1.119 #ifdef _LP64
1.120 Assembler::ldx(s1, s2, d);
1.121 #else
1.122 @@ -405,7 +405,7 @@
1.123 #endif
1.124 }
1.125
1.126 -inline void MacroAssembler::st_long( Register d, Register s1, RegisterConstant s2 ) {
1.127 +inline void MacroAssembler::st_long( Register d, Register s1, RegisterOrConstant s2 ) {
1.128 #ifdef _LP64
1.129 Assembler::stx(d, s1, s2);
1.130 #else
1.131 @@ -455,7 +455,7 @@
1.132 #endif
1.133 }
1.134
1.135 -inline void MacroAssembler::sll_ptr( Register s1, RegisterConstant s2, Register d ) {
1.136 +inline void MacroAssembler::sll_ptr( Register s1, RegisterOrConstant s2, Register d ) {
1.137 if (s2.is_register()) sll_ptr(s1, s2.as_register(), d);
1.138 else sll_ptr(s1, s2.as_constant(), d);
1.139 }
