eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into async-irreducible

Browse Source
This commit is contained in:
konsoletyper 2015-03-06 19:18:07 +03:00
commit bc43923695
4 changed files with 99 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TOutOfMemoryError.java Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright 2015 Alexey Andreev.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.classlib.java.lang;
/**
*
* @author Alexey Andreev
*/
public class TOutOfMemoryError extends TVirtualMachineError {
private static final long serialVersionUID = -1891949851728458692L;
public TOutOfMemoryError() {
super();
}
public TOutOfMemoryError(TString message) {
super(message);
}
}

32
teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TVirtualMachineError.java Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright 2015 Alexey Andreev.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.classlib.java.lang;
/**
*
* @author Alexey Andreev
*/
public class TVirtualMachineError extends TError {
private static final long serialVersionUID = -4246822614122675559L;
public TVirtualMachineError() {
super();
}
public TVirtualMachineError(TString message) {
super(message);
}
}

30
teavm-core/src/main/java/org/teavm/debugging/information/DebugInformation.java
View File

@ -386,7 +386,7 @@ public class DebugInformation {
}
private int indexByKey(RecordArray mapping, GeneratedLocation location) {
int index = Collections.binarySearch(new LocationList(mapping), location);
int index = binarySearchLocation(mapping, location.getLine(), location.getColumn());
return index >= 0 ? index : -index - 2;
}
@ -598,7 +598,33 @@ public class DebugInformation {
return new GeneratedLocation(record.get(0), record.get(1));
}
static class LocationList extends AbstractList<GeneratedLocation> {
private int binarySearchLocation(RecordArray array, int row, int column) {
int l = 0;
int u = array.size() - 1;
while (true) {
int i = (l + u) / 2;
RecordArray.Record e = array.get(i);
int cmp = Integer.compare(row, e.get(0));
if (cmp == 0) {
cmp = Integer.compare(column, e.get(1));
}
if (cmp == 0) {
return i;
} else if (cmp < 0) {
u = i - 1;
if (u < l) {
return -i - 1;
}
} else {
l = i + 1;
if (l > u) {
return -i - 2;
}
}
}
}
static class LocationList extends AbstractList<GeneratedLocation> implements RandomAccess {
private RecordArray recordArray;
public LocationList(RecordArray recordArray) {

7
teavm-core/src/main/java/org/teavm/model/util/MissingItemsProcessor.java
View File

@ -61,15 +61,22 @@ public class MissingItemsProcessor {
for (int i = 0; i < program.basicBlockCount(); ++i) {
BasicBlock block = program.basicBlockAt(i);
instructionsToAdd.clear();
boolean missing = false;
for (int j = 0; j < block.getInstructions().size(); ++j) {
Instruction insn = block.getInstructions().get(j);
insn.acceptVisitor(instructionProcessor);
if (!instructionsToAdd.isEmpty()) {
wasModified = true;
truncateBlock(block, j);
missing = true;
break;
}
}
if (!missing) {
for (TryCatchBlock tryCatch : block.getTryCatchBlocks()) {
checkClass(null, tryCatch.getExceptionType());
}
}
}
if (wasModified) {
new UnreachableBasicBlockEliminator().optimize(program);