From a01a0262beb208c075227434492a85605178a246 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sat, 14 Dec 2019 12:55:08 +0000
Subject: [PATCH] Two small Bochs debugger changes. - Fixed a warning in the
 enhanced debugger core. - Update generated file parser.c.

---
 bochs/bx_debug/parser.c | 2 +-
 bochs/gui/enh_dbg.cc    | 6 +++---
 bochs/gui/enh_dbg.h     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bochs/bx_debug/parser.c b/bochs/bx_debug/parser.c
index 310146b52..43a9401b3 100644
--- a/bochs/bx_debug/parser.c
+++ b/bochs/bx_debug/parser.c
@@ -3582,7 +3582,7 @@ yyreduce:
   case 211:
 #line 1089 "parser.y" /* yacc.c:1646  */
     {
-         dbg_printf("trace-mem on  - print all memory accesses occured during instruction execution\n");
+         dbg_printf("trace-mem on  - print all memory accesses occurred during instruction execution\n");
          dbg_printf("trace-mem off - disable memory accesses tracing\n");
          free((yyvsp[-2].sval));free((yyvsp[-1].sval));
        }
diff --git a/bochs/gui/enh_dbg.cc b/bochs/gui/enh_dbg.cc
index fc3e081e3..df4f9a165 100644
--- a/bochs/gui/enh_dbg.cc
+++ b/bochs/gui/enh_dbg.cc
@@ -8,7 +8,7 @@
 //
 //  Modified by Bruce Ewing
 //
-//  Copyright (C) 2008-2017  The Bochs Project
+//  Copyright (C) 2008-2019  The Bochs Project
 
 #include "config.h"
 
@@ -222,8 +222,8 @@ static const char *BrkName[5] = {
    "Read Watchpoint",
 };
 
-bx_address BrkLAddr[BX_DBG_MAX_LIN_BPOINTS];
-unsigned BrkIdx[BX_DBG_MAX_LIN_BPOINTS];
+bx_address BrkLAddr[BX_DBG_MAX_LIN_BPOINTS+1];
+unsigned BrkIdx[BX_DBG_MAX_LIN_BPOINTS+1];
 int BreakCount = 0;
 
 // Breakpoint Dump Window stuff
diff --git a/bochs/gui/enh_dbg.h b/bochs/gui/enh_dbg.h
index 5ba108692..be8f4e337 100644
--- a/bochs/gui/enh_dbg.h
+++ b/bochs/gui/enh_dbg.h
@@ -8,7 +8,7 @@
 //
 //  Modified by Bruce Ewing
 //
-//  Copyright (C) 2008-2014  The Bochs Project
+//  Copyright (C) 2008-2019  The Bochs Project
 
 
 #ifndef BX_ENH_DBG_DEF_H
@@ -394,7 +394,7 @@ extern Bit8u RegColor[TOT_REG_NUM];    // specifies foreground and background co
 extern int RitemToRnum[TOT_REG_NUM];   // mapping from Reg List Item# to register number
 
 // do the linear breakpoint list as 2 arrays, rather than a structure -- much easier to search!
-extern bx_address BrkLAddr[BX_DBG_MAX_LIN_BPOINTS];
+extern bx_address BrkLAddr[BX_DBG_MAX_LIN_BPOINTS+1];
 extern int BreakCount;
 
 // Breakpoint Dump Window stuff