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

fix allocation of large objects in allocate2(); remove references to jscheme and SWT in makefile and test directory

Browse Source
This commit is contained in:
Joel Dice 2007-09-19 08:16:49 -06:00
parent cc84e61561
commit cd990969cd
4 changed files with 5 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
makefile
View File

@ -15,11 +15,8 @@ cls = build/classes
src = src
classpath = classpath
test = test
jscheme = $(HOME)/p/jscheme-7.2/src
swt = $(HOME)/p/swt-3.3-$(arch)/bin
input = $(cls)/GC.class
swt-input = $(cls)/HelloSWT.class
cxx = g++
cc = gcc
@ -138,15 +135,10 @@ class-names = $(foreach x,$(1),$(call class-name,$(x)))
flags = -cp $(cls)
args = $(flags) $(call class-name,$(input))
jscheme-command = jscheme/REPL build/make.scm -main commandMain ""
swt-command = $(call class-name,$(swt-input))
.PHONY: build
build: $(executable) $(classpath-objects)
$(input): $(classpath-objects)
$(swt-input): $(classpath-objects)
.PHONY: run
run: $(executable) $(input)
@ -162,41 +154,9 @@ vg: $(executable) $(input)
.PHONY: test
test: $(executable) $(classpath-objects) $(test-classes)
LD_LIBRARY_PATH=$(bld) /bin/bash $(test)/test.sh \
LD_LIBRARY_PATH=$(bld) /bin/bash $(test)/test.sh 2>/dev/null \
$(<) $(mode) "$(flags)" $(call class-names,$(test-classes))
.PHONY: run-jscheme
run-jscheme: $(executable)
LD_LIBRARY_PATH=$(bld) $(<) -cp $(cls):$(jscheme) $(jscheme-command)
.PHONY: debug-jscheme
debug-jscheme: $(executable)
LD_LIBRARY_PATH=$(bld) $(db) $(<) -cp $(cls):$(jscheme) $(jscheme-command)
.PHONY: vg-jscheme
vg-jscheme: $(executable)
LD_LIBRARY_PATH=$(bld) $(vg) $(<) -cp $(cls):$(jscheme) $(jscheme-command)
.PHONY: profile-jscheme
profile-jscheme: $(executable)
opcontrol --start; \
echo '(+ 5 6)' | LD_LIBRARY_PATH=$(bld) \
$(<) -cp $(cls):$(jscheme) jscheme/REPL; \
opcontrol --stop; \
opreport -l $(<)
.PHONY: run-swt
run-swt: $(executable) $(swt-input)
LD_LIBRARY_PATH=$(bld) $(<) -cp $(cls):$(swt) $(swt-command)
.PHONY: debug-swt
debug-swt: $(executable) $(swt-input)
LD_LIBRARY_PATH=$(bld) $(db) $(<) -cp $(cls):$(swt) $(swt-command)
.PHONY: vg-swt
vg-swt: $(executable) $(swt-input)
LD_LIBRARY_PATH=$(bld) $(vg) $(<) -cp $(cls):$(swt) $(swt-command)
.PHONY: clean
clean:
@echo "removing build"
@ -218,7 +178,7 @@ $(bld)/type-generator.o: \
define compile-class
@echo "compiling $(@)"
@mkdir -p $(dir $(@))
$(javac) -bootclasspath $(classpath) -classpath $(classpath):$(swt) \
$(javac) -bootclasspath $(classpath) -classpath $(classpath) \
-d $(cls) $(<)
endef

4
src/heap.cpp
View File

@ -14,8 +14,8 @@ const unsigned Top = ~static_cast<unsigned>(0);
const unsigned InitialGen2CapacityInBytes = 4 * 1024 * 1024;
const bool Verbose = false;
const bool Verbose2 = false;
const bool Verbose = true;
const bool Verbose2 = true;
const bool Debug = false;
class Context;

2
src/machine.cpp
View File

@ -1637,7 +1637,7 @@ allocate2(Thread* t, unsigned sizeInBytes)
>= Thread::HeapSizeInWords)
{
t->heap = 0;
if (t->vm->heapPoolIndex < Machine::HeapPoolSize) {
if (t->large == 0 and t->vm->heapPoolIndex < Machine::HeapPoolSize) {
t->heap = static_cast<uintptr_t*>
(t->vm->system->tryAllocate(Thread::HeapSizeInBytes));
if (t->heap) {

25
test/HelloSWT.java
View File

@ -1,25 +0,0 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Label;
public class HelloSWT {
public static void main (String[] args) {
Display display = new Display();
final Shell shell = new Shell(display);
RowLayout layout = new RowLayout();
layout.justify = true;
layout.pack = true;
shell.setLayout(layout);
shell.setText("Hello, World!");
Label label = new Label(shell, SWT.CENTER);
label.setText("Hello, world!");
shell.pack();
shell.open();
while (!shell.isDisposed()) {
if (!display.readAndDispatch()) display.sleep();
}
display.dispose();
}
}