[vmkit-commits] [vmkit] r198409 - Unify the coding style: only use signature everywhere.
Gael Thomas
gael.thomas at lip6.fr
Fri Jan 3 04:16:33 PST 2014
Author: gthomas
Date: Fri Jan 3 06:16:33 2014
New Revision: 198409
URL: http://llvm.org/viewvc/llvm-project?rev=198409&view=rev
Log:
Unify the coding style: only use signature everywhere.
Modified:
vmkit/branches/mcjit/include/j3/j3.h
vmkit/branches/mcjit/include/j3/j3class.h
vmkit/branches/mcjit/include/j3/j3classloader.h
vmkit/branches/mcjit/lib/j3/vm/j3.cc
vmkit/branches/mcjit/lib/j3/vm/j3class.cc
vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc
vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
Modified: vmkit/branches/mcjit/include/j3/j3.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3.h?rev=198409&r1=198408&r2=198409&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3.h (original)
+++ vmkit/branches/mcjit/include/j3/j3.h Fri Jan 3 06:16:33 2014
@@ -134,7 +134,7 @@ namespace j3 {
static void noClassDefFoundError(const vmkit::Name* name) __attribute__((noreturn));
static void classFormatError(J3ObjectType* cl, const char* reason, ...) __attribute__((noreturn));
static void noSuchMethodError(const char* msg,
- J3ObjectType* clName, const vmkit::Name* name, J3Signature* sign) __attribute__((noreturn));
+ J3ObjectType* clName, const vmkit::Name* name, J3Signature* signature) __attribute__((noreturn));
static void noSuchFieldError(const char* msg,
J3ObjectType* clName, const vmkit::Name* name, J3Type* type) __attribute__((noreturn));
static void linkageError(J3Method* method) __attribute__((noreturn));
Modified: vmkit/branches/mcjit/include/j3/j3class.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3class.h?rev=198409&r1=198408&r2=198409&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3class.h (original)
+++ vmkit/branches/mcjit/include/j3/j3class.h Fri Jan 3 06:16:33 2014
@@ -125,8 +125,8 @@ namespace j3 {
J3InterfaceSlotDescriptor* slotDescriptorAt(uint32_t index) { return &_interfaceSlotDescriptors[index]; }
void prepareInterfaceTable();
- virtual J3Method* findVirtualMethod(const vmkit::Name* name, J3Signature* sign, bool error=1);
- virtual J3Method* findStaticMethod(const vmkit::Name* name, J3Signature* sign, bool error=1);
+ virtual J3Method* findVirtualMethod(const vmkit::Name* name, J3Signature* signature, bool error=1);
+ virtual J3Method* findStaticMethod(const vmkit::Name* name, J3Signature* signature, bool error=1);
bool isObjectType() { return 1; }
@@ -164,7 +164,7 @@ namespace j3 {
size_t nbPublicMethods() { return _nbPublicMethods; }
J3Method** methods() { return _methods; }
- J3Method* findMethod(const vmkit::Name* name, J3Signature* sign);
+ J3Method* findMethod(const vmkit::Name* name, J3Signature* signature);
J3Field* findField(const vmkit::Name* name, const J3Type* type);
virtual J3ObjectHandle* extractAttribute(J3Attribute* attr) = 0;
@@ -256,8 +256,8 @@ namespace j3 {
bool isClass() { return 1; }
- J3Method* findVirtualMethod(const vmkit::Name* name, J3Signature* sign, bool error=1);
- J3Method* findStaticMethod(const vmkit::Name* name, J3Signature* sign, bool error=1);
+ J3Method* findVirtualMethod(const vmkit::Name* name, J3Signature* signature, bool error=1);
+ J3Method* findStaticMethod(const vmkit::Name* name, J3Signature* signature, bool error=1);
J3Field* findVirtualField(const vmkit::Name* name, J3Type* type, bool error=1);
J3Field* findStaticField(const vmkit::Name* name, J3Type* type, bool error=1);
@@ -278,8 +278,8 @@ namespace j3 {
J3Type* component() { return _component; }
bool isArrayClass() { return 1; }
- J3Method* findVirtualMethod(const vmkit::Name* name, J3Signature* sign, bool error=1);
- J3Method* findStaticMethod(const vmkit::Name* name, J3Signature* sign, bool error=1);
+ J3Method* findVirtualMethod(const vmkit::Name* name, J3Signature* signature, bool error=1);
+ J3Method* findStaticMethod(const vmkit::Name* name, J3Signature* signature, bool error=1);
};
class J3Primitive : public J3Type {
Modified: vmkit/branches/mcjit/include/j3/j3classloader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3classloader.h?rev=198409&r1=198408&r2=198409&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3classloader.h (original)
+++ vmkit/branches/mcjit/include/j3/j3classloader.h Fri Jan 3 06:16:33 2014
@@ -68,10 +68,10 @@ namespace j3 {
J3Type* getTypeInternal(J3ObjectType* from, const vmkit::Name* type, uint32_t start, uint32_t* end);
J3Type* getType(J3ObjectType* from, const vmkit::Name* type); /* find a type */
- J3Signature* getSignature(J3ObjectType* from, const vmkit::Name* sign); /* get a method type */
+ J3Signature* getSignature(J3ObjectType* from, const vmkit::Name* signature); /* get a method type */
void wrongType(J3ObjectType* from, const vmkit::Name* type);
- uint32_t interfaceIndex(J3Method* sign);
+ uint32_t interfaceIndex(J3Method* signature);
J3GlobalReferences* globalReferences() { return &_globalReferences; }
@@ -80,7 +80,7 @@ namespace j3 {
J3* vm() const { return (J3*)vmkit::CompilationUnit::vm(); };
J3Method* method(uint16_t access, J3ObjectType* cl,
- const vmkit::Name* name, J3Signature* sign);
+ const vmkit::Name* name, J3Signature* signature);
J3Class* defineClass(const vmkit::Name* name, J3ClassBytes* bytes);
J3Class* findLoadedClass(const vmkit::Name* name);
Modified: vmkit/branches/mcjit/lib/j3/vm/j3.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3.cc?rev=198409&r1=198408&r2=198409&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3.cc Fri Jan 3 06:16:33 2014
@@ -99,7 +99,7 @@ void J3::run() {
clinitSign = initialClassLoader->getSignature(0, clinitSignName);
#define z_class(clName) initialClassLoader->loadClass(names()->get(clName))
-#define z_method(access, cl, name, sign) initialClassLoader->method(access, cl, name, initialClassLoader->getSignature(cl, sign))
+#define z_method(access, cl, name, signature) initialClassLoader->method(access, cl, name, initialClassLoader->getSignature(cl, signature))
#define z_field(access, cl, name, type) J3Cst::isStatic(access) \
? cl->findStaticField(names()->get(name), type) \
: cl->findVirtualField(names()->get(name), type);
@@ -207,8 +207,8 @@ void J3::noClassDefFoundError(const vmki
internalError("NoClassDefFoundError: %s", name);
}
-void J3::noSuchMethodError(const char* msg, J3ObjectType* cl, const vmkit::Name* name, J3Signature* sign) {
- internalError("%s: %s::%s %s", msg, cl->name()->cStr(), name->cStr(), sign->name()->cStr());
+void J3::noSuchMethodError(const char* msg, J3ObjectType* cl, const vmkit::Name* name, J3Signature* signature) {
+ internalError("%s: %s::%s %s", msg, cl->name()->cStr(), name->cStr(), signature->name()->cStr());
}
void J3::noSuchFieldError(const char* msg, J3ObjectType* cl, const vmkit::Name* name, J3Type* type) {
Modified: vmkit/branches/mcjit/lib/j3/vm/j3class.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3class.cc?rev=198409&r1=198408&r2=198409&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3class.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3class.cc Fri Jan 3 06:16:33 2014
@@ -168,11 +168,11 @@ llvm::Type* J3ObjectType::llvmType() {
return loader()->vm()->typeJ3ObjectPtr;
}
-J3Method* J3ObjectType::findVirtualMethod(const vmkit::Name* name, J3Signature* sign, bool error) {
+J3Method* J3ObjectType::findVirtualMethod(const vmkit::Name* name, J3Signature* signature, bool error) {
J3::internalError("should not happe: %s::%s\n", J3ObjectType::name()->cStr(), name->cStr());
}
-J3Method* J3ObjectType::findStaticMethod(const vmkit::Name* name, J3Signature* sign, bool error) {
+J3Method* J3ObjectType::findStaticMethod(const vmkit::Name* name, J3Signature* signature, bool error) {
J3::internalError("should not happen");
}
@@ -201,7 +201,7 @@ void J3ObjectType::prepareInterfaceTable
J3Method* base = ifce->methods()[j];
//fprintf(stderr, " processing %s method %s %s\n",
//J3Cst::isAbstract(base->access()) ? "abstract" : "concrete",
- //base->sign()->cStr(), base->name()->cStr());
+ //base->signature()->cStr(), base->name()->cStr());
J3Method* method = findVirtualMethod(base->name(), base->signature(), J3Cst::isAbstract(base->access()));
if(!method)
@@ -264,13 +264,13 @@ uintptr_t J3Layout::structSize() {
return _structSize;
}
-J3Method* J3Layout::findMethod(const vmkit::Name* name, J3Signature* sign) {
+J3Method* J3Layout::findMethod(const vmkit::Name* name, J3Signature* signature) {
for(size_t i=0; i<nbMethods(); i++) {
J3Method* cur = methods()[i];
- //printf("%s - %s\n", cur->name()->cStr(), cur->sign()->cStr());
- //printf("%s - %s\n", name->cStr(), sign->cStr());
- if(cur->name() == name && cur->signature() == sign) {
+ //printf("%s - %s\n", cur->name()->cStr(), cur->signature()->cStr());
+ //printf("%s - %s\n", name->cStr(), signature->cStr());
+ if(cur->name() == name && cur->signature() == signature) {
return cur;
}
}
@@ -313,21 +313,21 @@ J3ObjectHandle* J3Class::extractAttribut
return J3ObjectHandle::doNewArray(loader()->vm()->typeByte->getArray(), 0);
}
-J3Method* J3Class::findVirtualMethod(const vmkit::Name* name, J3Signature* sign, bool error) {
+J3Method* J3Class::findVirtualMethod(const vmkit::Name* name, J3Signature* signature, bool error) {
//loader()->vm()->log("Lookup: %s %s in %s (%d)", methName->cStr(), methSign->cStr(), name()->cStr(), nbVirtualMethods);
resolve();
J3Class* cur = this;
while(1) {
- J3Method* res = cur->findMethod(name, sign);
+ J3Method* res = cur->findMethod(name, signature);
if(res)
return res;
if(cur == cur->super()) {
if(error)
- J3::noSuchMethodError("no such method", this, name, sign);
+ J3::noSuchMethodError("no such method", this, name, signature);
else
return 0;
}
@@ -335,21 +335,21 @@ J3Method* J3Class::findVirtualMethod(con
}
}
-J3Method* J3Class::findStaticMethod(const vmkit::Name* name, J3Signature* sign, bool error) {
+J3Method* J3Class::findStaticMethod(const vmkit::Name* name, J3Signature* signature, bool error) {
//loader()->vm()->log("Lookup: %s %s in %s", methName->cStr(), methSign->cStr(), name()->cStr());
resolve();
J3Class* cur = this;
while(1) {
- J3Method* res = cur->staticLayout()->findMethod(name, sign);
+ J3Method* res = cur->staticLayout()->findMethod(name, signature);
if(res)
return res;
if(cur == cur->super()) {
if(error)
- J3::noSuchMethodError("no such method", this, name, sign);
+ J3::noSuchMethodError("no such method", this, name, signature);
else
return 0;
}
@@ -390,14 +390,14 @@ J3Field* J3Class::findStaticField(const
return res;
}
-void J3Class::registerNative(const vmkit::Name* name, const vmkit::Name* signName, void* fnPtr) {
+void J3Class::registerNative(const vmkit::Name* name, const vmkit::Name* signatureName, void* fnPtr) {
resolve();
- J3Signature* sign = loader()->getSignature(this, signName);
- J3Method* res = staticLayout()->findMethod(name, sign);
+ J3Signature* signature = loader()->getSignature(this, signatureName);
+ J3Method* res = staticLayout()->findMethod(name, signature);
if(!res)
- res = findMethod(name, sign);
+ res = findMethod(name, signature);
if(!res || !J3Cst::isNative(res->access()))
- J3::noSuchMethodError("unable to find native method", this, name, sign);
+ J3::noSuchMethodError("unable to find native method", this, name, signature);
res->registerNative(fnPtr);
}
@@ -618,8 +618,8 @@ void J3Class::readClassBytes(J3Field* hi
for(size_t i=0; i<n; i++) {
uint16_t access = reader.readU2();
const vmkit::Name* name = nameAt(reader.readU2());
- const vmkit::Name* sign = nameAt(reader.readU2());
- J3Method* method = loader()->method(access, this, name, loader()->getSignature(this, sign));
+ const vmkit::Name* signature = nameAt(reader.readU2());
+ J3Method* method = loader()->method(access, this, name, loader()->getSignature(this, signature));
J3Attributes* attributes = readAttributes(&reader);
method->postInitialise(access, attributes);
@@ -745,9 +745,9 @@ J3Method* J3Class::interfaceOrMethodAt(u
check(ntIdx, J3Cst::CONSTANT_NameAndType);
const vmkit::Name* name = nameAt(ctpValues[ntIdx] >> 16);
- const vmkit::Name* sign = nameAt(ctpValues[ntIdx] & 0xffff);
+ const vmkit::Name* signature = nameAt(ctpValues[ntIdx] & 0xffff);
- res = loader()->method(access, cl, name, loader()->getSignature(this, sign));
+ res = loader()->method(access, cl, name, loader()->getSignature(this, signature));
return res;
}
@@ -878,12 +878,12 @@ J3ObjectHandle* J3ArrayClass::clone(J3Ob
return res;
}
-J3Method* J3ArrayClass::findVirtualMethod(const vmkit::Name* name, J3Signature* sign, bool error) {
- return loader()->vm()->objectClass->findVirtualMethod(name, sign, error);
+J3Method* J3ArrayClass::findVirtualMethod(const vmkit::Name* name, J3Signature* signature, bool error) {
+ return loader()->vm()->objectClass->findVirtualMethod(name, signature, error);
}
-J3Method* J3ArrayClass::findStaticMethod(const vmkit::Name* name, J3Signature* sign, bool error) {
- return loader()->vm()->objectClass->findStaticMethod(name, sign, error);
+J3Method* J3ArrayClass::findStaticMethod(const vmkit::Name* name, J3Signature* signature, bool error) {
+ return loader()->vm()->objectClass->findStaticMethod(name, signature, error);
}
void J3ArrayClass::doResolve(J3Field* hiddenFields, size_t nbHiddenFields) {
Modified: vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc?rev=198409&r1=198408&r2=198409&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc Fri Jan 3 06:16:33 2014
@@ -169,44 +169,44 @@ J3Type* J3ClassLoader::getType(J3ObjectT
}
-J3Signature* J3ClassLoader::getSignature(J3ObjectType* from, const vmkit::Name* sign) {
+J3Signature* J3ClassLoader::getSignature(J3ObjectType* from, const vmkit::Name* signature) {
pthread_mutex_lock(&_mutexMethodTypes);
- J3Signature* res = methodTypes[sign];
+ J3Signature* res = methodTypes[signature];
if(!res) {
- J3Type* args[1+sign->length()];
+ J3Type* args[1+signature->length()];
uint32_t nbArgs = 0;
uint32_t cur = 1;
- if(sign->cStr()[0] != J3Cst::ID_Left)
- wrongType(from, sign);
+ if(signature->cStr()[0] != J3Cst::ID_Left)
+ wrongType(from, signature);
- while(sign->cStr()[cur] != J3Cst::ID_Right) {
- args[nbArgs++] = getTypeInternal(from, sign, cur, &cur);
+ while(signature->cStr()[cur] != J3Cst::ID_Right) {
+ args[nbArgs++] = getTypeInternal(from, signature, cur, &cur);
}
- args[nbArgs++] = getTypeInternal(from, sign, cur+1, &cur);
- if(cur != sign->length())
- wrongType(from, sign);
+ args[nbArgs++] = getTypeInternal(from, signature, cur+1, &cur);
+ if(cur != signature->length())
+ wrongType(from, signature);
- methodTypes[sign] = res = new(allocator(), nbArgs - 1) J3Signature(this, sign, args, nbArgs);
+ methodTypes[signature] = res = new(allocator(), nbArgs - 1) J3Signature(this, signature, args, nbArgs);
}
pthread_mutex_unlock(&_mutexMethodTypes);
return res;
}
-J3Method* J3ClassLoader::method(uint16_t access, J3ObjectType* type, const vmkit::Name* name, J3Signature* sign) {
+J3Method* J3ClassLoader::method(uint16_t access, J3ObjectType* type, const vmkit::Name* name, J3Signature* signature) {
if(type->isArrayClass())
- return method(access, vm()->objectClass, name, sign);
+ return method(access, vm()->objectClass, name, signature);
else {
J3Class* cl = type->asClass();
- J3Method method(access, cl, name, sign), *res;
+ J3Method method(access, cl, name, signature), *res;
pthread_mutex_lock(&_mutexMethods);
std::map<J3Method*, J3Method*>::iterator it = methods.find(&method);
if(it == methods.end()) {
- res = new(allocator()) J3Method(access, cl, name, sign);
+ res = new(allocator()) J3Method(access, cl, name, signature);
methods[res] = res;
} else {
res = it->second;
Modified: vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc?rev=198409&r1=198408&r2=198409&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc Fri Jan 3 06:16:33 2014
@@ -1534,7 +1534,7 @@ void J3CodeGen::translate() {
#if 0
void J3CodeGen::explore() {
- printf(" exploring bytecode of: %s::%s%s\n", method->cl()->name()->cStr(), method->name()->cStr(), method->sign()->cStr());
+ printf(" exploring bytecode of: %s::%s%s\n", method->cl()->name()->cStr(), method->name()->cStr(), method->signature()->cStr());
while(codeReader->remaining()) {
uint8_t bc = codeReader->readU1();
More information about the vmkit-commits
mailing list