Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add watchpoints and CSR support to GDBStub #14

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Add watchpoints and CSR support to GDBStub #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0d6eca7
Perform expensive subset size calculation only once
SamuelWAnderson45 Jun 27, 2022
a591c96
Add Watchpoints
SamuelWAnderson45 Jul 28, 2022
647dc2c
GDB: Support target description and p/P packet
SamuelWAnderson45 Aug 31, 2022
e0a285e
Fix HexUtils put32
SamuelWAnderson45 Sep 2, 2022
08f3833
Support CSR registers
SamuelWAnderson45 Sep 25, 2022
db48c09
Add special case for write only switch32 csr
SamuelWAnderson45 Sep 25, 2022
e297aac
Fix write watchpoint bug
SamuelWAnderson45 Sep 25, 2022
1a34dd6
Fix another write watchpoint bug
SamuelWAnderson45 Sep 25, 2022
01bc34e
TLB miss watchpoint optimization
SamuelWAnderson45 Sep 26, 2022
abfa5b2
Exit trace before handling breakpoint
SamuelWAnderson45 Sep 26, 2022
ef173a9
Redefine float CSRs get/set in terms of normal CSR get/set
SamuelWAnderson45 Oct 1, 2022
e3bf048
comment on GDB watchpoint behavior
SamuelWAnderson45 Oct 1, 2022
b1c0dad
Rename gdb target XML to be target specific
SamuelWAnderson45 Nov 18, 2022
0043773
Reword CSR comments
SamuelWAnderson45 Nov 18, 2022
659937e
Move GDB to riscv
SamuelWAnderson45 Nov 18, 2022
8bbcd76
Fix target description annex name in GDBStub
SamuelWAnderson45 Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/java/li/cil/sedna/instruction/InstructionDefinitionLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static HashMap<InstructionDeclaration, InstructionDefinition> load(final
}

final ClassReader cr = new ClassReader(stream);
cr.accept(new ClassVisitor(Opcodes.ASM7) {
cr.accept(new ClassVisitor(Opcodes.ASM8) {
@Override
public MethodVisitor visitMethod(final int access, final String name, final String descriptor, final String signature, final String[] exceptions) {
final InstructionFunctionVisitor visitor = new InstructionFunctionVisitor(implementation, name, descriptor, exceptions);
Expand Down Expand Up @@ -169,7 +169,7 @@ private static final class InstructionFunctionVisitor extends MethodVisitor {
private boolean writesPC;

public InstructionFunctionVisitor(final Class<?> implementation, final String name, final String descriptor, final String[] exceptions) {
super(Opcodes.ASM7);
super(Opcodes.ASM8);
this.implementation = implementation;
this.name = name;
this.descriptor = descriptor;
Expand All @@ -180,7 +180,7 @@ public InstructionFunctionVisitor(final Class<?> implementation, final String na
@Override
public AnnotationVisitor visitParameterAnnotation(final int parameter, final String descriptor, final boolean visible) {
if (Objects.equals(descriptor, Type.getDescriptor(InstructionDefinition.Field.class))) {
return new AnnotationVisitor(Opcodes.ASM7) {
return new AnnotationVisitor(Opcodes.ASM8) {
@Override
public void visit(final String name, final Object value) {
super.visit(name, value);
Expand Down Expand Up @@ -208,7 +208,7 @@ public void visit(final String name, final Object value) {
public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
if (Objects.equals(descriptor, Type.getDescriptor(InstructionDefinition.Instruction.class))) {
isImplementation = true;
return new AnnotationVisitor(Opcodes.ASM7) {
return new AnnotationVisitor(Opcodes.ASM8) {
@Override
public void visit(final String name, final Object value) {
super.visit(name, value);
Expand Down Expand Up @@ -345,12 +345,12 @@ private void resolveInvocations(final ArrayList<NonStaticMethodInvocation> known
}

final ClassReader reader = new ClassReader(stream);
reader.accept(new ClassVisitor(Opcodes.ASM7) {
reader.accept(new ClassVisitor(Opcodes.ASM8) {
@Override
public MethodVisitor visitMethod(final int access, final String methodName, final String methodDescriptor, final String signature, final String[] exceptions) {
if (methodName.equals(NonStaticMethodInvocation.this.name) &&
methodDescriptor.equals(NonStaticMethodInvocation.this.descriptor)) {
return new MethodVisitor(Opcodes.ASM7) {
return new MethodVisitor(Opcodes.ASM8) {
@Override
public void visitMethodInsn(final int opcode, final String invokedMethodOwner, final String invokedMethodName, final String invokedMethodDescriptor, final boolean isInterface) {
super.visitMethodInsn(opcode, invokedMethodOwner, invokedMethodName, invokedMethodDescriptor, isInterface);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/li/cil/sedna/instruction/decoder/DecoderGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public DecoderGenerator(final ClassVisitor cv,
final Class<?> illegalInstructionExceptionClass,
final String decoderMethod,
final String decoderHook) {
super(ASM7, cv);
super(ASM8, cv);
this.decoderTree = decoderTree;
this.definitionProvider = definitionProvider;
this.decoderMethod = decoderMethod;
Expand Down Expand Up @@ -193,7 +193,7 @@ private final class TemplateMethodVisitor extends MethodVisitor implements Opcod
private final ClassVisitor classVisitor;

public TemplateMethodVisitor(final MethodVisitor methodVisitor, final ClassVisitor classVisitor) {
super(Opcodes.ASM7, methodVisitor);
super(Opcodes.ASM8, methodVisitor);
this.classVisitor = classVisitor;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/li/cil/sedna/riscv/R5Board.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import li.cil.sedna.device.flash.FlashMemoryDevice;
import li.cil.sedna.devicetree.DeviceTreeRegistry;
import li.cil.sedna.devicetree.FlattenedDeviceTree;
import li.cil.sedna.gdbstub.GDBStub;
import li.cil.sedna.riscv.gdbstub.GDBStub;
import li.cil.sedna.memory.SimpleMemoryMap;
import li.cil.sedna.riscv.device.R5CoreLocalInterrupter;
import li.cil.sedna.riscv.device.R5PlatformLevelInterruptController;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/li/cil/sedna/riscv/R5CPU.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import li.cil.sedna.api.device.Steppable;
import li.cil.sedna.api.device.rtc.RealTimeCounter;
import li.cil.sedna.api.memory.MemoryMap;
import li.cil.sedna.gdbstub.CPUDebugInterface;
import li.cil.sedna.riscv.gdbstub.CPUDebugInterface;

import javax.annotation.Nullable;

Expand Down
Loading