mirror of
https://github.com/corda/corda.git
synced 2025-02-28 12:01:14 +00:00
snapshot
This commit is contained in:
parent
94e9bd0fd2
commit
514be2dc87
2
makefile
2
makefile
@ -28,7 +28,7 @@ src = src
|
||||
classpath = classpath
|
||||
test = test
|
||||
|
||||
input = $(test-build)/Reflection.class
|
||||
input = $(test-build)/Misc.class
|
||||
|
||||
build-cxx = g++
|
||||
build-cc = gcc
|
||||
|
@ -1371,6 +1371,8 @@ updateBootstrapClass(Thread* t, object bootstrapClass, object class_)
|
||||
and classObjectMask(t, class_) == 0)
|
||||
or intArrayEqual(t, classObjectMask(t, bootstrapClass),
|
||||
classObjectMask(t, class_)));
|
||||
expect(t, arrayLength(t, classVirtualTable(t, bootstrapClass))
|
||||
== arrayLength(t, classVirtualTable(t, class_)));
|
||||
|
||||
PROTECT(t, bootstrapClass);
|
||||
PROTECT(t, class_);
|
||||
@ -1528,8 +1530,9 @@ bootClass(Thread* t, Machine::Type type, int superType, uint32_t objectMask,
|
||||
|
||||
object super = (superType >= 0 ? arrayBody(t, t->m->types, superType) : 0);
|
||||
|
||||
object class_ = makeClass(t, 0, 0, 0, fixedSize, arrayElementSize, mask, 0,
|
||||
super, 0, 0, 0, 0, 0, t->m->loader);
|
||||
object class_ = makeClass
|
||||
(t, 0, BootstrapFlag, 0, fixedSize, arrayElementSize, mask, 0, super, 0, 0
|
||||
, 0, 0, 0, t->m->loader);
|
||||
|
||||
set(t, t->m->types, ArrayBody + (type * BytesPerWord), class_);
|
||||
}
|
||||
@ -2119,9 +2122,13 @@ stringChars(Thread* t, object string, char* chars)
|
||||
bool
|
||||
isAssignableFrom(Thread* t, object a, object b)
|
||||
{
|
||||
if (a == b) return true;
|
||||
if (a == b) {
|
||||
return true;
|
||||
} else if (classFlags(t, a) & ACC_INTERFACE) {
|
||||
if (classVmFlags(t, b) & BootstrapFlag) {
|
||||
resolveClass(t, className(t, b));
|
||||
}
|
||||
|
||||
if (classFlags(t, a) & ACC_INTERFACE) {
|
||||
for (; b; b = classSuper(t, b)) {
|
||||
object itable = classInterfaceTable(t, b);
|
||||
if (itable) {
|
||||
|
@ -62,6 +62,7 @@ const unsigned NeedInitFlag = 1 << 2;
|
||||
const unsigned InitFlag = 1 << 3;
|
||||
const unsigned PrimitiveFlag = 1 << 4;
|
||||
const unsigned SingletonFlag = 1 << 5;
|
||||
const unsigned BootstrapFlag = 1 << 6;
|
||||
|
||||
// method flags:
|
||||
const unsigned ClassInitFlag = 1 << 0;
|
||||
|
@ -1295,6 +1295,12 @@ parseJavaClass(Object* type, Stream* s, Object* declarations)
|
||||
|
||||
unsigned interfaceCount = s->read2();
|
||||
s->skip(interfaceCount * 2);
|
||||
// for (unsigned i = 0; i < interfaceCount; ++i) {
|
||||
// const char* name = reinterpret_cast<const char*>
|
||||
// (pool[pool[s->read2() - 1] - 1]);
|
||||
|
||||
// fprintf(stderr, "%s implements %s\n", typeJavaName(type), name);
|
||||
// }
|
||||
|
||||
unsigned fieldCount = s->read2();
|
||||
for (unsigned i = 0; i < fieldCount; ++i) {
|
||||
|
@ -14,9 +14,11 @@ public class Misc {
|
||||
return s;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
public static void main(String[] args) throws Exception {
|
||||
boolean v = Boolean.valueOf("true");
|
||||
|
||||
ClassLoader.getSystemClassLoader().toString();
|
||||
|
||||
int a = 2;
|
||||
int b = 2;
|
||||
int c = a + b;
|
||||
|
Loading…
x
Reference in New Issue
Block a user