/hg/icedtea6: Revert an accidental reversion

[gbenson at icedtea.classpath.org]

changeset 6af621b7b0e6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6af621b7b0e6
author: Gary Benson <gbenson at redhat.com>
date: Fri May 07 11:25:06 2010 +0100

	Revert an accidental reversion


diffstat:

2 files changed, 3 insertions(+), 10 deletions(-)
ChangeLog                                           |    4 ----
ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp |    9 +++------

diffs (41 lines):

diff -r d5ebbabd7488 -r 6af621b7b0e6 ChangeLog
--- a/ChangeLog	Fri May 07 10:51:15 2010 +0100
+++ b/ChangeLog	Fri May 07 11:25:06 2010 +0100
@@ -34,10 +34,6 @@ 2010-05-07  Gary Benson  <gbenson at redhat
 	* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
 	(JavaThread::set_last_Java_frame): Refactored.
 	(JavaThread::reset_last_Java_frame): Likewise.
-
-	* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp
-	(Disassembler::pd_instruction_alignment): Implemented.
-	(Disassembler::pd_cpu_opts): Likewise.
 
 	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Updated.
 	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
diff -r d5ebbabd7488 -r 6af621b7b0e6 ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp	Fri May 07 10:51:15 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp	Fri May 07 11:25:06 2010 +0100
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007 Red Hat, Inc.
+ * Copyright 2007, 2010 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
@@ -23,13 +23,10 @@
  *
  */
 
-// The disassembler prints out zero code annotated
-// with Java specific information.
-
   static int pd_instruction_alignment() {
-    ShouldNotCallThis();
+    return 1;
   }
 
   static const char* pd_cpu_opts() {
-    ShouldNotCallThis();
+    return "";
   }