comparison src/cpu/x86/vm/stubRoutines_x86_32.hpp @ 11173:6b0fd0964b87

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents b800986664f4
children
comparison
equal deleted inserted replaced
10912:4ea54634f03e 11173:6b0fd0964b87
1 /* 1 /*
2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, 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.
37 class x86 { 37 class x86 {
38 friend class StubGenerator; 38 friend class StubGenerator;
39 friend class VMStructs; 39 friend class VMStructs;
40 40
41 private: 41 private:
42 static address _verify_mxcsr_entry;
43 static address _verify_fpu_cntrl_wrd_entry; 42 static address _verify_fpu_cntrl_wrd_entry;
44 // shuffle mask for fixing up 128-bit words consisting of big-endian 32-bit integers
45 static address _key_shuffle_mask_addr;
46 43
47 public: 44 public:
48 static address verify_mxcsr_entry() { return _verify_mxcsr_entry; }
49 static address verify_fpu_cntrl_wrd_entry() { return _verify_fpu_cntrl_wrd_entry; } 45 static address verify_fpu_cntrl_wrd_entry() { return _verify_fpu_cntrl_wrd_entry; }
50 static address key_shuffle_mask_addr() { return _key_shuffle_mask_addr; } 46
47 # include "stubRoutines_x86.hpp"
51 48
52 }; 49 };
53 50
54 static bool returns_to_call_stub(address return_pc) { return return_pc == _call_stub_return_address; } 51 static bool returns_to_call_stub(address return_pc) { return return_pc == _call_stub_return_address; }
55 52