Index: frysk-gui/frysk/gui/srcwin/SourceBuffer.java
===================================================================
RCS file: /cvs/frysk/frysk-gui/frysk/gui/srcwin/SourceBuffer.java,v
retrieving revision 1.137
diff -u -r1.137 SourceBuffer.java
--- frysk-gui/frysk/gui/srcwin/SourceBuffer.java	13 Aug 2007 13:06:46 -0000	1.137
+++ frysk-gui/frysk/gui/srcwin/SourceBuffer.java	22 Aug 2007 11:44:14 -0000
@@ -870,7 +870,7 @@
 
 	this.firstLoad = false;
 
-	StringBuffer buffer = new StringBuffer();
+	StringBuilder buf = new StringBuilder();
 	Disassembler diss = new Disassembler(task.getMemory());
 
 	long address = frame.getAddress();
@@ -879,27 +879,23 @@
 
 	List instructionsList = diss.disassembleInstructions(address, 40);
 	Iterator iter = instructionsList.iterator();
-	Instruction ins = (Instruction) iter.next();
 
 	while (iter.hasNext()) {
-	    StringBuffer buf = new StringBuffer();
-	    buf.append("<");
+	    Instruction ins = (Instruction) iter.next();
+	    buf.append('<');
 	    buf.append(frame.getSymbol().getDemangledName());
 	    buf.append(" pc");
-	    buf.append("+");
+	    buf.append('+');
 	    buf.append(ins.address - address);
 	    buf.append(">: ");
 	    buf.append("0x");
 	    buf.append(Long.toHexString(ins.address));
-	    buf.append(" ");
+	    buf.append(' ');
 	    buf.append(ins.instruction);
-	    buf.append("\n");
-
-	    buffer.append(buf.toString());
-	    ins = (Instruction) iter.next();
+	    buf.append('\n');
 	}
 
-	this.insertText(buffer.toString());
+	this.insertText(buf.toString());
     }
 
     /**
Index: frysk-sys/lib/opcodes/cni/Disassembler.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/lib/opcodes/cni/Disassembler.cxx,v
retrieving revision 1.3
diff -u -r1.3 Disassembler.cxx
--- frysk-sys/lib/opcodes/cni/Disassembler.cxx	16 Aug 2007 19:22:34 -0000	1.3
+++ frysk-sys/lib/opcodes/cni/Disassembler.cxx	22 Aug 2007 12:22:19 -0000
@@ -195,7 +195,7 @@
 void
 lib::opcodes::Disassembler::disassemble (jlong address, jlong instructions)
 {
-#ifdef HAVE_LIPOPCODES
+#ifdef WITH_LIBOPCODES
   disassemble_info disasm_info;
   int instr_length = 0;
   int (*disasm_func) (bfd_vma, disassemble_info*) = NULL;