/hg/icedtea6: 2009-09-16 Gary Benson <gbenson at redhat.com>
gbenson at icedtea.classpath.org
gbenson at icedtea.classpath.org
Wed Sep 16 02:43:16 PDT 2009
changeset 79039da1a614 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=79039da1a614
author: Gary Benson <gbenson at redhat.com>
date: Wed Sep 16 05:36:53 2009 -0400
2009-09-16 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp:
* ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp:
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/debug_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp:
* ports/hotspot/src/cpu/zero/vm/dump_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp:
* ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/icache_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp:
* ports/hotspot/src/cpu/zero/vm/register_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp:
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp:
* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp:
Replaced calls to "Unimplemented()" in stubs with calls to
"ShouldNotCallThis()".
diffstat:
21 files changed, 186 insertions(+), 159 deletions(-)
ChangeLog | 25 ++++
ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 26 +---
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 9 -
ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp | 57 +++++-----
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 10 -
ports/hotspot/src/cpu/zero/vm/debug_zero.cpp | 2
ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp | 4
ports/hotspot/src/cpu/zero/vm/dump_zero.cpp | 2
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 8 -
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 10 -
ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp | 6 -
ports/hotspot/src/cpu/zero/vm/icache_zero.cpp | 2
ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 2
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp | 56 ++++-----
ports/hotspot/src/cpu/zero/vm/register_zero.cpp | 4
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp | 18 +--
ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp | 14 +-
ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp | 46 ++++----
ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp | 8 -
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 34 ++---
ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 2
diffs (truncated from 959 to 500 lines):
diff -r 260b65087a73 -r 79039da1a614 ChangeLog
--- a/ChangeLog Tue Sep 15 12:47:59 2009 -0400
+++ b/ChangeLog Wed Sep 16 05:36:53 2009 -0400
@@ -1,3 +1,28 @@ 2009-09-15 Deepak Bhole <dbhole at redhat
+2009-09-16 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp:
+ * ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp:
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/debug_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp:
+ * ports/hotspot/src/cpu/zero/vm/dump_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp:
+ * ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/icache_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp:
+ * ports/hotspot/src/cpu/zero/vm/register_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp:
+ * ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp:
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp:
+ * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp:
+ Replaced calls to "Unimplemented()" in stubs with calls to
+ "ShouldNotCallThis()".
+
2009-09-15 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp Wed Sep 16 05:36:53 2009 -0400
@@ -31,12 +31,12 @@ int AbstractAssembler::code_fill_byte()
}
void Assembler::pd_patch_instruction(address branch, address target) {
- Unimplemented();
+ ShouldNotCallThis();
}
#ifndef PRODUCT
void Assembler::pd_print_patched_instruction(address branch) {
- Unimplemented();
+ ShouldNotCallThis();
}
#endif // PRODUCT
@@ -46,7 +46,7 @@ void MacroAssembler::align(int modulus)
}
void MacroAssembler::bang_stack_with_offset(int offset) {
- Unimplemented();
+ ShouldNotCallThis();
}
void MacroAssembler::advance(int bytes) {
@@ -59,22 +59,14 @@ void MacroAssembler::store_oop(jobject o
emit_address((address) obj);
}
-static void _UnimplementedStub() {
- report_unimplemented(__FILE__, __LINE__);
+static void should_not_call() {
+ report_should_not_call(__FILE__, __LINE__);
}
-address UnimplementedStub() {
- return (address) _UnimplementedStub;
+address ShouldNotCallThisStub() {
+ return (address) should_not_call;
}
-address UnimplementedEntry() {
- return (address) _UnimplementedStub;
+address ShouldNotCallThisEntry() {
+ return (address) should_not_call;
}
-
-static void _ShouldNotReachHereStub() {
- report_should_not_reach_here(__FILE__, __LINE__);
-}
-
-address ShouldNotReachHereStub() {
- return (address) _ShouldNotReachHereStub;
-}
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Wed Sep 16 05:36:53 2009 -0400
@@ -32,6 +32,7 @@ class Assembler : public AbstractAssembl
public:
Assembler(CodeBuffer* code) : AbstractAssembler(code) {}
+ public:
void pd_patch_instruction(address branch, address target);
#ifndef PRODUCT
static void pd_print_patched_instruction(address branch);
@@ -42,6 +43,7 @@ class MacroAssembler : public Assembler
public:
MacroAssembler(CodeBuffer* code) : Assembler(code) {}
+ public:
void align(int modulus);
void bang_stack_with_offset(int offset);
bool needs_explicit_null_check(intptr_t offset);
@@ -53,13 +55,12 @@ class MacroAssembler : public Assembler
#ifdef ASSERT
inline bool AbstractAssembler::pd_check_instruction_mark() {
- Unimplemented();
+ ShouldNotCallThis();
}
#endif
-address UnimplementedStub();
-address UnimplementedEntry();
-address ShouldNotReachHereStub();
+address ShouldNotCallThisStub();
+address ShouldNotCallThisEntry();
// Nothing to do with the assembler (or lack of),
// just a real convenient place to include these.
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp Wed Sep 16 05:36:53 2009 -0400
@@ -1,6 +1,6 @@
/*
* Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,9 @@
*/
typedef union unaligned {
- u4 u;
- u2 us;
- u8 ul;
+ u4 u;
+ u2 us;
+ u8 ul;
} __attribute__((packed)) unaligned;
class Bytes: AllStatic {
@@ -43,51 +43,60 @@ class Bytes: AllStatic {
// Efficient reading and writing of unaligned unsigned data in
// platform-specific byte ordering.
- static inline u2 get_native_u2(address p){
- unaligned *up = (unaligned *)p;
- return up->us;
+ static inline u2 get_native_u2(address p){
+ unaligned *up = (unaligned *) p;
+ return up->us;
}
- static inline u4 get_native_u4(address p) {
- unaligned *up = (unaligned *)p;
- return up->u;
+ static inline u4 get_native_u4(address p) {
+ unaligned *up = (unaligned *) p;
+ return up->u;
}
- static inline u8 get_native_u8(address p) {
- unaligned *up = (unaligned *)p;
- return up->ul;
+ static inline u8 get_native_u8(address p) {
+ unaligned *up = (unaligned *) p;
+ return up->ul;
}
static inline void put_native_u2(address p, u2 x) {
- unaligned *up = (unaligned *)p;
- up->us = x;
+ unaligned *up = (unaligned *) p;
+ up->us = x;
}
static inline void put_native_u4(address p, u4 x) {
- unaligned *up = (unaligned *)p;
- up->u = x;
+ unaligned *up = (unaligned *) p;
+ up->u = x;
}
static inline void put_native_u8(address p, u8 x) {
- unaligned *up = (unaligned *)p;
- up->ul = x;
+ unaligned *up = (unaligned *) p;
+ up->ul = x;
}
-
// Efficient reading and writing of unaligned unsigned data in Java
// byte ordering (i.e. big-endian ordering).
#ifdef VM_LITTLE_ENDIAN
// Byte-order reversal is needed
static inline u2 get_Java_u2(address p) {
- return ( u2(p[0]) << 8 ) | ( u2(p[1]) );
+ return (u2(p[0]) << 8) |
+ (u2(p[1]) );
}
static inline u4 get_Java_u4(address p) {
- return ( u4(p[0]) << 24 ) | ( u4(p[1]) << 16 ) | ( u4(p[2]) << 8 ) | ( u4(p[3]) );
+ return (u4(p[0]) << 24) |
+ (u4(p[1]) << 16) |
+ (u4(p[2]) << 8) |
+ (u4(p[3]) );
}
static inline u8 get_Java_u8(address p) {
u4 hi, lo;
- hi = ( u4(p[0]) << 24 ) | ( u4(p[1]) << 16 ) | ( u4(p[2]) << 8 ) | ( u4(p[3]) );
- lo = ( u4(p[4]) << 24 ) | ( u4(p[5]) << 16 ) | ( u4(p[6]) << 8 ) | ( u4(p[7]) );
+ hi = (u4(p[0]) << 24) |
+ (u4(p[1]) << 16) |
+ (u4(p[2]) << 8) |
+ (u4(p[3]) );
+ lo = (u4(p[4]) << 24) |
+ (u4(p[5]) << 16) |
+ (u4(p[6]) << 8) |
+ (u4(p[7]) );
return u8(lo) | (u8(hi) << 32);
}
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Sep 16 05:36:53 2009 -0400
@@ -901,7 +901,7 @@ void BytecodeInterpreter::layout_interpr
}
address CppInterpreter::return_entry(TosState state, int length) {
- Unimplemented();
+ ShouldNotCallThis();
}
address CppInterpreter::deopt_entry(TosState state, int length) {
@@ -929,25 +929,25 @@ address CppInterpreterGenerator::generat
address CppInterpreterGenerator::generate_result_handler_for(
BasicType type) {
assembler()->advance(1);
- return ShouldNotReachHereStub();
+ return ShouldNotCallThisStub();
}
address CppInterpreterGenerator::generate_tosca_to_stack_converter(
BasicType type) {
assembler()->advance(1);
- return ShouldNotReachHereStub();
+ return ShouldNotCallThisStub();
}
address CppInterpreterGenerator::generate_stack_to_stack_converter(
BasicType type) {
assembler()->advance(1);
- return ShouldNotReachHereStub();
+ return ShouldNotCallThisStub();
}
address CppInterpreterGenerator::generate_stack_to_native_abi_converter(
BasicType type) {
assembler()->advance(1);
- return ShouldNotReachHereStub();
+ return ShouldNotCallThisStub();
}
#endif // CC_INTERP
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/debug_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/debug_zero.cpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/debug_zero.cpp Wed Sep 16 05:36:53 2009 -0400
@@ -27,5 +27,5 @@
#include "incls/_debug_zero.cpp.incl"
void pd_ps(frame f) {
- Unimplemented();
+ ShouldNotCallThis();
}
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp Wed Sep 16 05:36:53 2009 -0400
@@ -27,9 +27,9 @@
// with Java specific information.
static int pd_instruction_alignment() {
- Unimplemented();
+ ShouldNotCallThis();
}
static const char* pd_cpu_opts() {
- Unimplemented();
+ ShouldNotCallThis();
}
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/dump_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/dump_zero.cpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/dump_zero.cpp Wed Sep 16 05:36:53 2009 -0400
@@ -32,5 +32,5 @@ void CompactingPermGenGen::generate_vtab
char* md_end,
char** mc_top,
char* mc_end) {
- Unimplemented();
+ ShouldNotCallThis();
}
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Wed Sep 16 05:36:53 2009 -0400
@@ -28,7 +28,7 @@
#ifdef ASSERT
void RegisterMap::check_location_valid() {
- Unimplemented();
+ ShouldNotCallThis();
}
#endif
@@ -81,7 +81,7 @@ frame frame::sender(RegisterMap* map) co
if (is_deoptimizer_frame())
return sender_for_deoptimizer_frame(map);
- Unimplemented();
+ ShouldNotReachHere();
}
#ifdef CC_INTERP
@@ -102,14 +102,14 @@ void frame::patch_pc(Thread* thread, add
}
bool frame::safe_for_sender(JavaThread *thread) {
- Unimplemented();
+ ShouldNotCallThis();
}
void frame::pd_gc_epilog() {
}
bool frame::is_interpreted_frame_valid(JavaThread *thread) const {
- Unimplemented();
+ ShouldNotCallThis();
}
BasicType frame::interpreter_frame_result(oop* oop_result,
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Wed Sep 16 05:36:53 2009 -0400
@@ -75,7 +75,7 @@ inline intptr_t* frame::sender_sp() cons
}
inline intptr_t* frame::link() const {
- Unimplemented();
+ ShouldNotCallThis();
}
#ifdef CC_INTERP
@@ -133,19 +133,19 @@ inline JavaCallWrapper* frame::entry_fra
}
inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
- Unimplemented();
+ ShouldNotCallThis();
}
inline oop frame::saved_oop_result(RegisterMap* map) const {
- Unimplemented();
+ ShouldNotCallThis();
}
inline bool frame::is_older(intptr_t* id) const {
- Unimplemented();
+ ShouldNotCallThis();
}
inline intptr_t* frame::entry_frame_argument_at(int offset) const {
- Unimplemented();
+ ShouldNotCallThis();
}
inline intptr_t* frame::unextended_sp() const {
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp Wed Sep 16 05:36:53 2009 -0400
@@ -35,15 +35,15 @@ void InlineCacheBuffer::assemble_ic_buff
oop cached_oop,
address entry_point) {
// NB ic_stub_code_size() must return the size of the code we generate
- Unimplemented();
+ ShouldNotCallThis();
}
address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
- Unimplemented();
+ ShouldNotCallThis();
}
oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
- Unimplemented();
+ ShouldNotCallThis();
}
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/icache_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/icache_zero.cpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/icache_zero.cpp Wed Sep 16 05:36:53 2009 -0400
@@ -28,5 +28,5 @@
void ICacheStubGenerator::generate_icache_flush(
ICache::flush_icache_stub_t* flush_icache_stub) {
- Unimplemented();
+ ShouldNotCallThis();
}
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp Wed Sep 16 05:36:53 2009 -0400
@@ -40,7 +40,7 @@ address InterpreterGenerator::generate_m
}
address InterpreterGenerator::generate_abstract_entry() {
- return UnimplementedEntry();
+ return ShouldNotCallThisEntry();
}
int AbstractInterpreter::size_activation(methodOop method,
diff -r 260b65087a73 -r 79039da1a614 ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp Wed Sep 16 05:36:53 2009 -0400
@@ -41,16 +41,16 @@ class NativeInstruction VALUE_OBJ_CLASS_
class NativeInstruction VALUE_OBJ_CLASS_SPEC {
public:
bool is_jump() {
- Unimplemented();
+ ShouldNotCallThis();
}
bool is_safepoint_poll() {
- Unimplemented();
+ ShouldNotCallThis();
}
};
inline NativeInstruction* nativeInstruction_at(address address) {
- Unimplemented();
+ ShouldNotCallThis();
}
class NativeCall : public NativeInstruction {
@@ -60,82 +60,82 @@ class NativeCall : public NativeInstruct
};
address instruction_address() const {
- Unimplemented();
+ ShouldNotCallThis();
}
address next_instruction_address() const {
- Unimplemented();
+ ShouldNotCallThis();
}
address return_address() const {
- Unimplemented();
+ ShouldNotCallThis();
}
address destination() const {
- Unimplemented();
+ ShouldNotCallThis();
}
void set_destination_mt_safe(address dest) {
- Unimplemented();
+ ShouldNotCallThis();
}
void verify_alignment() {
- Unimplemented();
+ ShouldNotCallThis();
}
void verify() {
- Unimplemented();
+ ShouldNotCallThis();
}
static bool is_call_before(address return_address) {
- Unimplemented();
+ ShouldNotCallThis();
}
};
inline NativeCall* nativeCall_before(address return_address) {
- Unimplemented();
+ ShouldNotCallThis();
}
inline NativeCall* nativeCall_at(address address) {
- Unimplemented();
+ ShouldNotCallThis();
}
More information about the distro-pkg-dev
mailing list