[vmkit-commits] [vmkit] r137019 - in /vmkit/trunk: include/mvm/Object.h include/mvm/PrintBuffer.h include/mvm/UTF8.h lib/J3/VMCore/JavaClass.h lib/J3/VMCore/JavaObject.h lib/J3/VMCore/JavaThread.h lib/J3/VMCore/Jnjvm.h lib/J3/VMCore/JnjvmClassLoader.h lib/J3/VMCore/Reader.h lib/J3/VMCore/UTF8.h lib/Mvm/Runtime/Object.cpp lib/Mvm/Runtime/UTF8.cpp tools/j3/Main.cpp tools/precompiler/Precompiler.cpp tools/vmjc/vmjc.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Sat Aug 6 07:53:43 PDT 2011
Author: geoffray
Date: Sat Aug 6 09:53:42 2011
New Revision: 137019
URL: http://llvm.org/viewvc/llvm-project?rev=137019&view=rev
Log:
Remove dead code.
Removed:
vmkit/trunk/include/mvm/Object.h
vmkit/trunk/include/mvm/PrintBuffer.h
Modified:
vmkit/trunk/include/mvm/UTF8.h
vmkit/trunk/lib/J3/VMCore/JavaClass.h
vmkit/trunk/lib/J3/VMCore/JavaObject.h
vmkit/trunk/lib/J3/VMCore/JavaThread.h
vmkit/trunk/lib/J3/VMCore/Jnjvm.h
vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
vmkit/trunk/lib/J3/VMCore/Reader.h
vmkit/trunk/lib/J3/VMCore/UTF8.h
vmkit/trunk/lib/Mvm/Runtime/Object.cpp
vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp
vmkit/trunk/tools/j3/Main.cpp
vmkit/trunk/tools/precompiler/Precompiler.cpp
vmkit/trunk/tools/vmjc/vmjc.cpp
Removed: vmkit/trunk/include/mvm/Object.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Object.h?rev=137018&view=auto
==============================================================================
--- vmkit/trunk/include/mvm/Object.h (original)
+++ vmkit/trunk/include/mvm/Object.h (removed)
@@ -1,56 +0,0 @@
-//===---------- Object.h - Common layout for all objects ------------------===//
-//
-// The Micro Virtual Machine
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef MVM_OBJECT_H
-#define MVM_OBJECT_H
-
-#include "types.h"
-#include "MvmGC.h"
-
-namespace mvm {
-
-
-#define VT_DESTRUCTOR_OFFSET 0
-#define VT_OPERATOR_DELETE_OFFSET 1
-#define VT_TRACER_OFFSET 2
-#define VT_PRINT_OFFSET 3
-#define VT_HASHCODE_OFFSET 4
-#define VT_NB_FUNCS 5
-#define VT_SIZE 5 * sizeof(void*)
-
-
-class PrintBuffer;
-
-/// Object - Root of all objects. Define default implementations of virtual
-/// methods and some commodity functions.
-///
-class Object : public gc {
-public:
- static void default_tracer(gc *o, uintptr_t closure) {}
- static intptr_t default_hashCode(const gc *o) { return (intptr_t)o; }
- static void default_print(const gc *o, PrintBuffer *buf);
-
- /// tracer - Default implementation of tracer. Does nothing.
- ///
- virtual void tracer(uintptr_t closure) { default_tracer(this, closure); }
-
- /// print - Default implementation of print.
- ///
- virtual void print(PrintBuffer *buf) const { default_print(this, buf); }
-
- /// hashCode - Default implementation of hashCode. Returns the address
- /// of this object.
- ///
- virtual intptr_t hashCode() const { return default_hashCode(this);}
-
-};
-
-} // end namespace mvm
-
-#endif // MVM_OBJECT_H
Removed: vmkit/trunk/include/mvm/PrintBuffer.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/PrintBuffer.h?rev=137018&view=auto
==============================================================================
--- vmkit/trunk/include/mvm/PrintBuffer.h (original)
+++ vmkit/trunk/include/mvm/PrintBuffer.h (removed)
@@ -1,186 +0,0 @@
-//===--------------- PrintBuffer.h - Printing objects ----------------------===//
-//
-// The Micro Virtual Machine
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef MVM_PRINTBUFFER_H
-#define MVM_PRINTBUFFER_H
-
-#include <cstdio> // sprintf
-#include <cstring> // memcpy
-
-#include "types.h"
-#include "mvm/Object.h"
-#include "mvm/UTF8.h"
-
-namespace mvm {
-
-/// PrintBuffer - This class is a buffered string.
-///
-class PrintBuffer {
-public:
-
- /// contents - The buffer.
- ///
- char* contents;
-
- /// capacity - The capacity of the current buffer.
- ///
- uint32 capacity;
-
- /// writePosition - The position in the buffer where the next write will
- /// happen.
- ///
- uint32 writePosition;
-
- void init() {
- capacity = 256;
- contents = new char[capacity];
- writePosition = 0;
- }
-
-public:
- PrintBuffer() {
- init();
- }
-
- template <class T>
- PrintBuffer(const T *obj) {
- init();
- writeObj(obj);
- }
-
- PrintBuffer(const Object *obj) {
- llvm_gcroot(obj, 0);
- init();
- writeObj(obj);
- }
-
- virtual ~PrintBuffer() {
- delete[] contents;
- }
-
- char *cString() {
- return contents;
- }
-
- void ensureCapacity(uint32 len) {
- uint32 size = writePosition + len + 1;
- if (size >= capacity) {
- while (size >= capacity)
- capacity*= 4;
- char *newContents = new char[capacity];
- memcpy(newContents, contents, writePosition);
- delete[] contents;
- contents = newContents;
- }
- }
-
- /// write - Writes to this PrintBuffer.
- ///
- virtual PrintBuffer *write(const char *string) {
- uint32 len= strlen(string);
- ensureCapacity(len);
- strcpy(cString() + writePosition, string);
- writePosition+= len;
- return this;
- }
-
- /// writeChar - Writes a char.
- inline PrintBuffer *writeUTF8(const UTF8 *utf8) {
- uint32 len = utf8->size;
- ensureCapacity(len);
- for(uint32 i=0; i<len; i++) {
- // printf("%d/%d: '%c (%d)'\n", i, len, utf8->elements[i], utf8->elements[i]);
- contents[writePosition + i] = utf8->elements[i];
- }
- contents[writePosition += len] = 0;
- return this;
- }
-
- /// writeChar - Writes a char.
- inline PrintBuffer *writeBool(bool v) {
- return write(v ? "true" : "false");
- }
-
- /// writeChar - Writes a char.
- inline PrintBuffer *writeChar(char v) {
- char buf[32];
- sprintf(buf, "%c", v);
- return write(buf);
- }
-
- /// writeChar - Writes a int32.
- inline PrintBuffer *writeS4(int v) {
- char buf[32];
- sprintf(buf, "%d", v);
- return write(buf);
- }
-
- /// writes8 - Writes a int64.
- inline PrintBuffer *writeS8(sint64 v) {
- char buf[32];
- sprintf(buf, "%lld", (long long int)v);
- return write(buf);
- }
-
- /// writeFP - Writes a double.
- inline PrintBuffer *writeFP(double v) {
- char buf[32];
- sprintf(buf, "%f", v);
- return write(buf);
- }
-
- /// writePtr - Writes a pointer.
- inline PrintBuffer *writePtr(void *p) {
- char buf[32];
- sprintf(buf, "%p", p);
- return write(buf);
- }
-
- /// writeBytes - Writes len bytes in the buffer bytes.
- inline PrintBuffer *writeBytes(unsigned char *bytes, size_t len) {
- write("[");
- for (size_t idx= 0; idx < len; ++idx) {
- if (idx > 0)
- write(" ");
- char buf[32];
- sprintf(buf, "%d", bytes[idx]);
- write(buf);
- }
- write("]");
- return this;
- }
-
- /// writeObj - Writes anything (except an object) to the buffer.
- ///
- template <class T>
- inline PrintBuffer *writeObj(const T *obj) {
- obj->print(this);
- return this;
- }
-
- /// writeObj - Writes a gc Object to the buffer.
- ///
- inline PrintBuffer *writeObj(const Object *obj) {
- llvm_gcroot(obj, 0);
- obj->print(this);
- return this;
- }
-
-
- /// replaceWith - replace the content of the buffer and free the old buffer
- ///
- void replaceWith(char *buffer) {
- delete[] this->contents;
- this->contents = buffer;
- }
-};
-
-} // end namespace mvm
-
-#endif // MVM_PRINTBUFFER_H
Modified: vmkit/trunk/include/mvm/UTF8.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/UTF8.h?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/UTF8.h (original)
+++ vmkit/trunk/include/mvm/UTF8.h Sat Aug 6 09:53:42 2011
@@ -8,7 +8,6 @@
namespace mvm {
-class PrintBuffer;
class UTF8Map;
class UTF8 {
@@ -53,8 +52,6 @@
size * sizeof(uint16)) < 0;
}
- void print(PrintBuffer *pb) const;
-
static uint32_t readerHasher(const uint16* buf, sint32 size);
uint32_t hash() const {
@@ -144,8 +141,6 @@
allocator.Deallocate((void*)*i);
}
}
-
- void insert(const UTF8* val);
};
class UTF8Builder {
Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.h?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.h Sat Aug 6 09:53:42 2011
@@ -15,7 +15,6 @@
#include "mvm/Allocator.h"
#include "mvm/MethodInfo.h"
-#include "mvm/Object.h"
#include "mvm/Threads/Cond.h"
#include "mvm/Threads/Locks.h"
Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.h?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.h Sat Aug 6 09:53:42 2011
@@ -11,10 +11,10 @@
#define JNJVM_JAVA_OBJECT_H
#include "mvm/Allocator.h"
-#include "mvm/Object.h"
#include "mvm/UTF8.h"
#include "mvm/Threads/Locks.h"
#include "mvm/Threads/Thread.h"
+#include "MvmGC.h"
#include "types.h"
Modified: vmkit/trunk/lib/J3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaThread.h?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaThread.h Sat Aug 6 09:53:42 2011
@@ -10,7 +10,6 @@
#ifndef JNJVM_JAVA_THREAD_H
#define JNJVM_JAVA_THREAD_H
-#include "mvm/Object.h"
#include "mvm/Threads/Cond.h"
#include "mvm/Threads/Locks.h"
#include "mvm/Threads/ObjectLocks.h"
Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.h?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.h Sat Aug 6 09:53:42 2011
@@ -16,7 +16,6 @@
#include "mvm/Allocator.h"
#include "mvm/MethodInfo.h"
-#include "mvm/Object.h"
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Cond.h"
#include "mvm/Threads/Locks.h"
Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h Sat Aug 6 09:53:42 2011
@@ -18,7 +18,6 @@
#include "mvm/Allocator.h"
-#include "mvm/Object.h"
#include "JavaObject.h"
#include "JnjvmConfig.h"
Modified: vmkit/trunk/lib/J3/VMCore/Reader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Reader.h?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Reader.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Reader.h Sat Aug 6 09:53:42 2011
@@ -10,8 +10,6 @@
#ifndef JNJVM_READER_H
#define JNJVM_READER_H
-#include "mvm/Object.h"
-
#include "types.h"
#include "JavaArray.h"
Modified: vmkit/trunk/lib/J3/VMCore/UTF8.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/UTF8.h?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/UTF8.h (original)
+++ vmkit/trunk/lib/J3/VMCore/UTF8.h Sat Aug 6 09:53:42 2011
@@ -13,7 +13,6 @@
#include "types.h"
#include "mvm/UTF8.h"
-#include "mvm/PrintBuffer.h"
namespace j3 {
using mvm::UTF8;
@@ -22,15 +21,27 @@
/// UTF8Buffer - Helper class to create char* buffers suitable for
/// printf.
///
-class UTF8Buffer : public mvm::PrintBuffer {
+class UTF8Buffer {
public:
+ char* contents;
+
/// UTF8Buffer - Create a buffer with the following UTF8.
- UTF8Buffer(const UTF8* val) : mvm::PrintBuffer(val) {}
+ UTF8Buffer(const UTF8* val) {
+ contents = new char[val->size + 1];
+ for (int i = 0; i < val->size; i++) {
+ contents[i] = (char)val->elements[i];
+ }
+ contents[val->size] = 0;
+ }
+
+ char* cString() const {
+ return contents;
+ }
/// toCompileName - Change the utf8 following JNI conventions.
///
UTF8Buffer* toCompileName(const char* suffix = "") {
- const char *buffer = cString();
+ const char *buffer = contents;
uint32 len = strlen(buffer);
uint32 suffixLen = strlen(suffix);
char* newBuffer = new char[(len << 1) + suffixLen + 1];
@@ -58,9 +69,14 @@
newBuffer[j++] = suffix[i];
}
newBuffer[j] = 0;
- replaceWith(newBuffer);
+ delete[] contents;
+ contents = newBuffer;
return this;
}
+
+ ~UTF8Buffer() {
+ delete[] contents;
+ }
};
}
Modified: vmkit/trunk/lib/Mvm/Runtime/Object.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/Object.cpp?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Object.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Object.cpp Sat Aug 6 09:53:42 2011
@@ -11,8 +11,6 @@
#include <cstdlib>
#include "MvmGC.h"
-#include "mvm/Object.h"
-#include "mvm/PrintBuffer.h"
#include "mvm/VirtualMachine.h"
using namespace mvm;
@@ -37,25 +35,6 @@
fprintf(stderr, "%p\n", ptr);
}
-extern "C" void write_ptr(PrintBuffer* buf, void* obj) {
- buf->writePtr(obj);
-}
-
-extern "C" void write_int(PrintBuffer* buf, int a) {
- buf->writeS4(a);
-}
-
-extern "C" void write_str(PrintBuffer* buf, char* a) {
- buf->write(a);
-}
-
-void Object::default_print(const gc *o, PrintBuffer *buf) {
- llvm_gcroot(o, 0);
- buf->write("<Object@");
- buf->writePtr((void*)o);
- buf->write(">");
-}
-
void VirtualMachine::waitForExit() {
threadLock.lock();
Modified: vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp Sat Aug 6 09:53:42 2011
@@ -9,7 +9,6 @@
#include "mvm/Allocator.h"
#include "mvm/UTF8.h"
-#include "mvm/PrintBuffer.h"
namespace mvm {
@@ -17,11 +16,6 @@
extern "C" const UTF8 EmptyKey(0);
-void UTF8::print(PrintBuffer *pb) const {
- pb->writeUTF8(this);
-}
-
-
const UTF8* UTF8::extract(UTF8Map* map, uint32 start, uint32 end) const {
uint32 len = end - start;
ThreadAllocator allocator;
@@ -98,10 +92,4 @@
return res;
}
-
-void UTF8Map::insert(const UTF8* val) {
- UTF8MapKey key(val->elements, val->size);
- map[key] = val;
-}
-
} // namespace mvm
Modified: vmkit/trunk/tools/j3/Main.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Main.cpp?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/tools/j3/Main.cpp (original)
+++ vmkit/trunk/tools/j3/Main.cpp Sat Aug 6 09:53:42 2011
@@ -10,7 +10,6 @@
#include "MvmGC.h"
#include "mvm/JIT.h"
#include "mvm/MethodInfo.h"
-#include "mvm/Object.h"
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Thread.h"
Modified: vmkit/trunk/tools/precompiler/Precompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/precompiler/Precompiler.cpp?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/tools/precompiler/Precompiler.cpp (original)
+++ vmkit/trunk/tools/precompiler/Precompiler.cpp Sat Aug 6 09:53:42 2011
@@ -18,7 +18,6 @@
#include "MvmGC.h"
#include "mvm/JIT.h"
#include "mvm/MethodInfo.h"
-#include "mvm/Object.h"
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Thread.h"
Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=137019&r1=137018&r2=137019&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Sat Aug 6 09:53:42 2011
@@ -40,7 +40,6 @@
#include "MvmGC.h"
#include "mvm/JIT.h"
-#include "mvm/Object.h"
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Thread.h"
More information about the vmkit-commits
mailing list