ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-01 10:46:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixes for various recent regressions

Browse Source
This commit is contained in:
Joel Dice 2007-09-30 10:32:17 -06:00
parent 7caedba26f
commit 7ecb5b9c30
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
makefile
View File

@ -156,24 +156,24 @@ args = $(flags) $(call class-name,$(input))
.PHONY: build .PHONY: build
build: $(executable) $(classpath-objects) $(test-classes) build: $(executable) $(classpath-objects) $(test-classes)
$(input): $(classpath-objects) $(input): $(classpath-classes)
.PHONY: run .PHONY: run
run: $(executable) $(input) run: build
$(ld-library-path)=$(bld) $(<) $(args) $(ld-library-path)=$(bld) $(executable) $(args)
.PHONY: debug .PHONY: debug
debug: $(executable) $(input) debug: build
LD_LIBRARY_PATH=$(bld) gdb --args $(<) $(args) LD_LIBRARY_PATH=$(bld) gdb --args $(executable) $(args)
.PHONY: vg .PHONY: vg
vg: $(executable) $(input) vg: build
LD_LIBRARY_PATH=$(bld) $(vg) $(<) $(args) LD_LIBRARY_PATH=$(bld) $(vg) $(executable) $(args)
.PHONY: test .PHONY: test
test: $(executable) $(classpath-objects) $(test-classes) test: build
LD_LIBRARY_PATH=$(bld) /bin/bash $(test)/test.sh 2>/dev/null \ LD_LIBRARY_PATH=$(bld) /bin/bash $(test)/test.sh 2>/dev/null \
$(<) $(mode) "$(flags)" $(call class-names,$(test-classes)) $(executable) $(mode) "$(flags)" $(call class-names,$(test-classes))
.PHONY: clean .PHONY: clean
clean: clean:
@ -198,6 +198,7 @@ define compile-class
@mkdir -p $(dir $(@)) @mkdir -p $(dir $(@))
$(javac) -bootclasspath $(classpath) -classpath $(classpath) \ $(javac) -bootclasspath $(classpath) -classpath $(classpath) \
-d $(cls) $(<) -d $(cls) $(<)
@touch $(@)
endef endef
$(cls)/%.class: $(classpath)/%.java $(cls)/%.class: $(classpath)/%.java

4
src/compile.cpp
View File

@ -668,10 +668,10 @@ gpRegister(Thread* t, unsigned index)
} }
SSERegister SSERegister
sseRegister(Thread* t, unsigned index) sseRegister(Thread* t UNUSED, unsigned index)
{ {
assert(t, index < 8); assert(t, index < 8);
return static_cast<SSERegister>(index); return static_cast<SSERegister>(index);
} }
unsigned unsigned

2
src/interpret.cpp
View File

@ -1524,7 +1524,7 @@ interpret(Thread* t)
object a = popObject(t); object a = popObject(t);
if (a == b) { if (a == b) {
ip = (ip - 3) + offset); ip = (ip - 3) + offset;
} }
} goto loop; } goto loop;

7
src/machine.cpp
View File

@ -1465,6 +1465,9 @@ Thread::Thread(Machine* m, object javaThread, Thread* parent):
enter(t, Thread::ActiveState); enter(t, Thread::ActiveState);
resolveClass
(t, className(t, arrayBody(t, m->types,
Machine::SystemClassLoaderType)));
resolveClass resolveClass
(t, className(t, arrayBody(t, m->types, Machine::ClassType))); (t, className(t, arrayBody(t, m->types, Machine::ClassType)));
resolveClass resolveClass
@ -1482,7 +1485,9 @@ Thread::Thread(Machine* m, object javaThread, Thread* parent):
(this, reinterpret_cast<int64_t>(this), 0, 0, 0, 0, m->loader); (this, reinterpret_cast<int64_t>(this), 0, 0, 0, 0, m->loader);
} }
enter(this, Thread::IdleState); if (parent == 0) {
enter(this, Thread::IdleState);
}
} }
void void