Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1329-gab6634d7
|
From: darcagn <da...@us...> - 2024-04-19 21:07:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via ab6634d7e39a0e1ff371e6bf7288c2fc88fc4b29 (commit)
via 6818e1c9aee7346ee4d7dea24c9c767d727e3d39 (commit)
via b8ca531ec6d9fd8c25747f92f0e873552ec65c33 (commit)
via 148611ffffa434cd186d8d8535113b7cdd90918e (commit)
from ede9ebfd0eb7ac0be7a787fed379a2e7baffcbf4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ab6634d7e39a0e1ff371e6bf7288c2fc88fc4b29
Merge: 6818e1c9 148611ff
Author: Luke Benstead <ka...@gm...>
Date: Fri Apr 19 21:25:19 2024 +0100
Merge pull request #510 from KallistiOS/cmake_min
Set minimum Cmake version based on actual minimum requirements
commit 6818e1c9aee7346ee4d7dea24c9c767d727e3d39
Merge: ede9ebfd b8ca531e
Author: Luke Benstead <ka...@gm...>
Date: Fri Apr 19 21:22:02 2024 +0100
Merge pull request #512 from pcercuei/fix-gdb-stub
gdb-stub: Fix GDB stub broken since IRQ context rework
commit b8ca531ec6d9fd8c25747f92f0e873552ec65c33
Author: Paul Cercueil <pa...@cr...>
Date: Thu Apr 18 23:05:24 2024 +0200
gdb-stub: Fix GDB stub broken since IRQ context rework
The GDB stub was broken since commit a7789e643 ("Faster IRQ context
saving / restore (#406)").
This was because the GDB stub did not bother to use the irq_context_t
structure, and instead would just make assumptions on the layout of the
structure.
Signed-off-by: Paul Cercueil <pa...@cr...>
commit 148611ffffa434cd186d8d8535113b7cdd90918e
Author: QuzarDC <qu...@co...>
Date: Mon Apr 15 10:36:52 2024 -0400
Set minimum version required based on actual minimum requirements
-----------------------------------------------------------------------
Summary of changes:
kernel/arch/dreamcast/kernel/gdb_stub.c | 46 ++++++++++++++-------------------
utils/cmake/dreamcast.cmake | 3 ++-
utils/cmake/dreamcast.toolchain.cmake | 3 ++-
3 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/kernel/arch/dreamcast/kernel/gdb_stub.c b/kernel/arch/dreamcast/kernel/gdb_stub.c
index af1f61d2..062c76a4 100644
--- a/kernel/arch/dreamcast/kernel/gdb_stub.c
+++ b/kernel/arch/dreamcast/kernel/gdb_stub.c
@@ -154,6 +154,7 @@
#include <arch/arch.h>
#include <arch/cache.h>
+#include <stddef.h>
#include <string.h>
/* Hitachi SH architecture instruction encoding masks */
@@ -235,18 +236,9 @@ static int dofault; /* Non zero, bus errors will raise exception */
/* debug > 0 prints ill-formed commands in valid packets & checksum errors */
static int remote_debug;
-enum regnames {
- R0, R1, R2, R3, R4, R5, R6, R7,
- R8, R9, R10, R11, R12, R13, R14, R15,
- PC, PR, GBR, VBR, MACH, MACL, SR,
- FPUL, FPSCR,
- FR0, FR1, FR2, FR3, FR4, FR5, FR6, FR7,
- FR8, FR9, FR10, FR11, FR12, FR13, FR14, FR15
-};
-
/* map from KOS register context order to GDB sh4 order */
-#define KOS_REG( r ) ( ((uint32)&((irq_context_t*)0)->r) / sizeof(uint32) )
+#define KOS_REG(r) offsetof(irq_context_t, r)
static uint32 kosRegMap[] = {
KOS_REG(r[0]), KOS_REG(r[1]), KOS_REG(r[2]), KOS_REG(r[3]),
@@ -272,7 +264,7 @@ typedef struct {
}
stepData;
-static uint32 *registers;
+static irq_context_t *irq_ctx;
static stepData instrBuffer;
static char stepped;
static const char hexchars[] = "0123456789abcdef";
@@ -525,7 +517,7 @@ static void doSStep(void) {
int reg;
unsigned short opcode, br_opcode;
- instrMem = (short *) registers[PC];
+ instrMem = (short *) irq_ctx->pc;
opcode = *instrMem;
stepped = 1;
@@ -533,7 +525,7 @@ static void doSStep(void) {
br_opcode = opcode & COND_BR_MASK;
if(br_opcode == BT_INSTR || br_opcode == BTS_INSTR) {
- if(registers[SR] & T_BIT_MASK) {
+ if(irq_ctx->sr & T_BIT_MASK) {
displacement = (opcode & COND_DISP) << 1;
if(displacement & 0x80)
@@ -543,7 +535,7 @@ static void doSStep(void) {
* Remember PC points to second instr.
* after PC of branch ... so add 4
*/
- instrMem = (short *)(registers[PC] + displacement + 4);
+ instrMem = (short *)(irq_ctx->pc + displacement + 4);
}
else {
/* can't put a trapa in the delay slot of a bt/s instruction */
@@ -551,7 +543,7 @@ static void doSStep(void) {
}
}
else if(br_opcode == BF_INSTR || br_opcode == BFS_INSTR) {
- if(registers[SR] & T_BIT_MASK) {
+ if(irq_ctx->sr & T_BIT_MASK) {
/* can't put a trapa in the delay slot of a bf/s instruction */
instrMem += (br_opcode == BFS_INSTR) ? 2 : 1;
}
@@ -565,7 +557,7 @@ static void doSStep(void) {
* Remember PC points to second instr.
* after PC of branch ... so add 4
*/
- instrMem = (short *)(registers[PC] + displacement + 4);
+ instrMem = (short *)(irq_ctx->pc + displacement + 4);
}
}
else if((opcode & UCOND_DBR_MASK) == BRA_INSTR) {
@@ -578,17 +570,17 @@ static void doSStep(void) {
* Remember PC points to second instr.
* after PC of branch ... so add 4
*/
- instrMem = (short *)(registers[PC] + displacement + 4);
+ instrMem = (short *)(irq_ctx->pc + displacement + 4);
}
else if((opcode & UCOND_RBR_MASK) == JSR_INSTR) {
reg = (char)((opcode & UCOND_REG) >> 8);
- instrMem = (short *) registers[reg];
+ instrMem = (short *) irq_ctx->r[reg];
}
else if(opcode == RTS_INSTR)
- instrMem = (short *) registers[PR];
+ instrMem = (short *) irq_ctx->pr;
else if(opcode == RTE_INSTR)
- instrMem = (short *) registers[15];
+ instrMem = (short *) irq_ctx->r[15];
else if((opcode & TRAPA_MASK) == TRAPA_INSTR)
instrMem = (short *)((opcode & ~TRAPA_MASK) << 2);
else
@@ -748,7 +740,7 @@ static void gdb_handle_exception(int exceptionVector) {
char* outBuf = remcomOutBuffer;
for(i = 0; i < NUMREGBYTES / 4; i++)
- outBuf = mem2hex((char *)(registers + kosRegMap[i]), outBuf, 4);
+ outBuf = mem2hex((char *)((uint32)irq_ctx + kosRegMap[i]), outBuf, 4);
}
break;
@@ -757,7 +749,7 @@ static void gdb_handle_exception(int exceptionVector) {
char* inBuf = ptr;
for(i = 0; i < NUMREGBYTES / 4; i++, inBuf += 8)
- hex2mem(inBuf, (char *)(registers + kosRegMap[i]), 4);
+ hex2mem(inBuf, (char *)((uint32)irq_ctx + kosRegMap[i]), 4);
strcpy(remcomOutBuffer, "OK");
}
@@ -812,7 +804,7 @@ static void gdb_handle_exception(int exceptionVector) {
case 'c': {
/* tRY, to read optional parameter, pc unchanged if no param */
if(hexToInt(&ptr, &addr))
- registers[PC] = addr;
+ irq_ctx->pc = addr;
if(stepping)
doSStep();
@@ -914,14 +906,14 @@ static void flushDebugChannel(void) {
static void handle_exception(irq_t code, irq_context_t *context, void *data) {
(void)data;
- registers = (uint32 *)context;
+ irq_ctx = context;
gdb_handle_exception(code);
}
static void handle_user_trapa(irq_t code, irq_context_t *context, void *data) {
(void)code;
(void)data;
- registers = (uint32 *)context;
+ irq_ctx = context;
gdb_handle_exception(EXC_TRAPA);
}
@@ -934,8 +926,8 @@ static void handle_gdb_trapa(irq_t code, irq_context_t *context, void *data) {
*/
(void)code;
(void)data;
- registers = (uint32 *)context;
- registers[PC] -= 2;
+ irq_ctx = context;
+ irq_ctx->pc -= 2;
gdb_handle_exception(EXC_TRAPA);
}
diff --git a/utils/cmake/dreamcast.cmake b/utils/cmake/dreamcast.cmake
index 607ace5c..4fff3a9c 100644
--- a/utils/cmake/dreamcast.cmake
+++ b/utils/cmake/dreamcast.cmake
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.23)
+### This minimum is based on the minimum requirement in dreamcast.toolchain.cmake
+cmake_minimum_required(VERSION 3.13)
### Helper Function for Bin2Object ###
function(kos_bin2o inFile symbol)
diff --git a/utils/cmake/dreamcast.toolchain.cmake b/utils/cmake/dreamcast.toolchain.cmake
index 79a59e19..23071c9e 100644
--- a/utils/cmake/dreamcast.toolchain.cmake
+++ b/utils/cmake/dreamcast.toolchain.cmake
@@ -16,7 +16,8 @@
# The original toolchain file was created by Kazade for the Simulant
# engine who has graciously allowed the rest of the scene to warez it.
-cmake_minimum_required(VERSION 3.23)
+#### This minimum is due to the use of add_link_options
+cmake_minimum_required(VERSION 3.13)
#### Set Configuration Variables From Environment ####
if(NOT DEFINED KOS_BASE)
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
