1.1 --- a/src/cpu/zero/vm/interpreter_zero.cpp Mon Apr 11 15:30:31 2011 -0700
1.2 +++ b/src/cpu/zero/vm/interpreter_zero.cpp Tue Apr 12 02:40:23 2011 -0700
1.3 @@ -1,6 +1,6 @@
1.4 /*
1.5 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 - * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
1.7 + * Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 *
1.10 * This code is free software; you can redistribute it and/or modify it
1.11 @@ -49,6 +49,9 @@
1.12 #ifdef COMPILER1
1.13 #include "c1/c1_Runtime1.hpp"
1.14 #endif
1.15 +#ifdef CC_INTERP
1.16 +#include "interpreter/cppInterpreter.hpp"
1.17 +#endif
1.18
1.19 address AbstractInterpreterGenerator::generate_slow_signature_handler() {
1.20 _masm->advance(1);
1.21 @@ -64,11 +67,15 @@
1.22 }
1.23
1.24 address InterpreterGenerator::generate_abstract_entry() {
1.25 - return ShouldNotCallThisEntry();
1.26 + return generate_entry((address) ShouldNotCallThisEntry());
1.27 }
1.28
1.29 address InterpreterGenerator::generate_method_handle_entry() {
1.30 - return ShouldNotCallThisEntry();
1.31 +#ifdef CC_INTERP
1.32 + return generate_entry((address) CppInterpreter::method_handle_entry);
1.33 +#else
1.34 + return generate_entry((address) ShouldNotCallThisEntry());
1.35 +#endif // CC_INTERP
1.36 }
1.37
1.38 bool AbstractInterpreter::can_be_compiled(methodHandle m) {
