comparison src/cpu/x86/vm/interpreterRT_x86_64.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 da91efe96a93
children
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 /* 1 /*
2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2003, 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.
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "interpreter/interpreter.hpp" 26 #include "interpreter/interpreter.hpp"
27 #include "interpreter/interpreterRuntime.hpp" 27 #include "interpreter/interpreterRuntime.hpp"
28 #include "memory/allocation.inline.hpp" 28 #include "memory/allocation.inline.hpp"
29 #include "memory/universe.inline.hpp" 29 #include "memory/universe.inline.hpp"
30 #include "oops/methodOop.hpp" 30 #include "oops/method.hpp"
31 #include "oops/oop.inline.hpp" 31 #include "oops/oop.inline.hpp"
32 #include "runtime/handles.inline.hpp" 32 #include "runtime/handles.inline.hpp"
33 #include "runtime/icache.hpp" 33 #include "runtime/icache.hpp"
34 #include "runtime/interfaceSupport.hpp" 34 #include "runtime/interfaceSupport.hpp"
35 #include "runtime/signature.hpp" 35 #include "runtime/signature.hpp"
478 #endif 478 #endif
479 479
480 480
481 IRT_ENTRY(address, 481 IRT_ENTRY(address,
482 InterpreterRuntime::slow_signature_handler(JavaThread* thread, 482 InterpreterRuntime::slow_signature_handler(JavaThread* thread,
483 methodOopDesc* method, 483 Method* method,
484 intptr_t* from, 484 intptr_t* from,
485 intptr_t* to)) 485 intptr_t* to))
486 methodHandle m(thread, (methodOop)method); 486 methodHandle m(thread, (Method*)method);
487 assert(m->is_native(), "sanity check"); 487 assert(m->is_native(), "sanity check");
488 488
489 // handle arguments 489 // handle arguments
490 SlowSignatureHandler(m, (address)from, to + 1).iterate(UCONST64(-1)); 490 SlowSignatureHandler(m, (address)from, to + 1).iterate(UCONST64(-1));
491 491