Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed alignment asserts (broke tests). Fixed bounds checks in memory classes.

Browse Source
This commit is contained in:
Florian Nücke
2020-09-26 11:29:57 +02:00
parent 641b603c2f
commit 452f02e102
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/li/cil/circuity/vm/device/memory/ByteBufferMemory.java
View File

@@ -29,7 +29,7 @@ public class ByteBufferMemory implements PhysicalMemory {
@Override
public int load(final int offset, final int sizeLog2) throws MemoryAccessException {
if (offset < 0 || offset >= data.limit()) {
if (offset < 0 || offset >= data.limit() - (1 << sizeLog2)) {
throw new LoadFaultException(offset);
}
switch (sizeLog2) {
@@ -46,7 +46,7 @@ public class ByteBufferMemory implements PhysicalMemory {
@Override
public void store(final int offset, final int value, final int sizeLog2) throws MemoryAccessException {
if (offset < 0 || offset >= data.limit()) {
if (offset < 0 || offset >= data.limit() - (1 << sizeLog2)) {
throw new StoreFaultException(offset);
}
switch (sizeLog2) {

8
src/main/java/li/cil/circuity/vm/device/memory/UnsafeMemory.java
View File

@@ -52,17 +52,15 @@ public final class UnsafeMemory implements PhysicalMemory {
@Override
public int load(final int offset, final int sizeLog2) throws MemoryAccessException {
if (offset < 0 || offset >= size) {
if (offset < 0 || offset >= size - (1 << sizeLog2)) {
throw new LoadFaultException(offset);
}
switch (sizeLog2) {
case Sizes.SIZE_8_LOG2:
return UNSAFE.getByte(address + offset);
case Sizes.SIZE_16_LOG2:
assert (offset & 0b1) == 0;
return UNSAFE.getShort(address + offset);
case Sizes.SIZE_32_LOG2:
assert (offset & 0b11) == 0;
return UNSAFE.getInt(address + offset);
default:
throw new IllegalArgumentException();
@@ -71,7 +69,7 @@ public final class UnsafeMemory implements PhysicalMemory {
@Override
public void store(final int offset, final int value, final int sizeLog2) throws MemoryAccessException {
if (offset < 0 || offset >= size) {
if (offset < 0 || offset >= size - (1 << sizeLog2)) {
throw new LoadFaultException(offset);
}
switch (sizeLog2) {
@@ -79,11 +77,9 @@ public final class UnsafeMemory implements PhysicalMemory {
UNSAFE.putByte(address + offset, (byte) value);
break;
case Sizes.SIZE_16_LOG2:
assert (offset & 0b1) == 0;
UNSAFE.putShort(address + offset, (short) value);
break;
case Sizes.SIZE_32_LOG2:
assert (offset & 0b11) == 0;
UNSAFE.putInt(address + offset, value);
break;
default: