2000-02-02 01:21:19 +01:00
|
|
|
|
/* Remote serial interface for local (hardwired) serial ports for GO32.
|
2017-01-01 07:50:51 +01:00
|
|
|
|
Copyright (C) 1992-2017 Free Software Foundation, Inc.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
Contributed by Nigel Stephens, Algorithmics Ltd. (nigel@algor.co.uk).
|
|
|
|
|
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
This version uses DPMI interrupts to handle buffered i/o
|
1999-04-16 03:35:26 +02:00
|
|
|
|
without the separate "asynctsr" program.
|
|
|
|
|
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
This file is part of GDB.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-08-23 20:08:50 +02:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-04-16 03:35:26 +02:00
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-23 20:08:50 +02:00
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
|
#include "serial.h"
|
|
|
|
|
/*
|
|
|
|
|
* NS16550 UART registers
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define COM1ADDR 0x3f8
|
|
|
|
|
#define COM2ADDR 0x2f8
|
|
|
|
|
#define COM3ADDR 0x3e8
|
|
|
|
|
#define COM4ADDR 0x3e0
|
|
|
|
|
|
|
|
|
|
#define com_data 0 /* data register (R/W) */
|
|
|
|
|
#define com_dlbl 0 /* divisor latch low (W) */
|
|
|
|
|
#define com_ier 1 /* interrupt enable (W) */
|
|
|
|
|
#define com_dlbh 1 /* divisor latch high (W) */
|
|
|
|
|
#define com_iir 2 /* interrupt identification (R) */
|
|
|
|
|
#define com_fifo 2 /* FIFO control (W) */
|
|
|
|
|
#define com_lctl 3 /* line control register (R/W) */
|
|
|
|
|
#define com_cfcr 3 /* line control register (R/W) */
|
|
|
|
|
#define com_mcr 4 /* modem control register (R/W) */
|
|
|
|
|
#define com_lsr 5 /* line status register (R/W) */
|
|
|
|
|
#define com_msr 6 /* modem status register (R/W) */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Constants for computing 16 bit baud rate divisor (lower byte
|
|
|
|
|
* in com_dlbl, upper in com_dlbh) from 1.8432MHz crystal. Divisor is
|
|
|
|
|
* 1.8432 MHz / (16 * X) for X bps. If the baud rate can't be set
|
|
|
|
|
* to within +- (desired_rate*SPEED_TOLERANCE/1000) bps, we fail.
|
|
|
|
|
*/
|
|
|
|
|
#define COMTICK (1843200/16)
|
|
|
|
|
#define SPEED_TOLERANCE 30 /* thousandths; real == desired +- 3.0% */
|
|
|
|
|
|
|
|
|
|
/* interrupt enable register */
|
|
|
|
|
#define IER_ERXRDY 0x1 /* int on rx ready */
|
|
|
|
|
#define IER_ETXRDY 0x2 /* int on tx ready */
|
|
|
|
|
#define IER_ERLS 0x4 /* int on line status change */
|
|
|
|
|
#define IER_EMSC 0x8 /* int on modem status change */
|
|
|
|
|
|
|
|
|
|
/* interrupt identification register */
|
|
|
|
|
#define IIR_FIFO_MASK 0xc0 /* set if FIFOs are enabled */
|
|
|
|
|
#define IIR_IMASK 0xf /* interrupt cause mask */
|
|
|
|
|
#define IIR_NOPEND 0x1 /* nothing pending */
|
|
|
|
|
#define IIR_RLS 0x6 /* receive line status */
|
|
|
|
|
#define IIR_RXRDY 0x4 /* receive ready */
|
|
|
|
|
#define IIR_RXTOUT 0xc /* receive timeout */
|
|
|
|
|
#define IIR_TXRDY 0x2 /* transmit ready */
|
|
|
|
|
#define IIR_MLSC 0x0 /* modem status */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* fifo control register */
|
|
|
|
|
#define FIFO_ENABLE 0x01 /* enable fifo */
|
|
|
|
|
#define FIFO_RCV_RST 0x02 /* reset receive fifo */
|
|
|
|
|
#define FIFO_XMT_RST 0x04 /* reset transmit fifo */
|
|
|
|
|
#define FIFO_DMA_MODE 0x08 /* enable dma mode */
|
|
|
|
|
#define FIFO_TRIGGER_1 0x00 /* trigger at 1 char */
|
|
|
|
|
#define FIFO_TRIGGER_4 0x40 /* trigger at 4 chars */
|
|
|
|
|
#define FIFO_TRIGGER_8 0x80 /* trigger at 8 chars */
|
|
|
|
|
#define FIFO_TRIGGER_14 0xc0 /* trigger at 14 chars */
|
|
|
|
|
|
|
|
|
|
/* character format control register */
|
|
|
|
|
#define CFCR_DLAB 0x80 /* divisor latch */
|
|
|
|
|
#define CFCR_SBREAK 0x40 /* send break */
|
|
|
|
|
#define CFCR_PZERO 0x30 /* zero parity */
|
|
|
|
|
#define CFCR_PONE 0x20 /* one parity */
|
|
|
|
|
#define CFCR_PEVEN 0x10 /* even parity */
|
|
|
|
|
#define CFCR_PODD 0x00 /* odd parity */
|
|
|
|
|
#define CFCR_PENAB 0x08 /* parity enable */
|
|
|
|
|
#define CFCR_STOPB 0x04 /* 2 stop bits */
|
|
|
|
|
#define CFCR_8BITS 0x03 /* 8 data bits */
|
|
|
|
|
#define CFCR_7BITS 0x02 /* 7 data bits */
|
|
|
|
|
#define CFCR_6BITS 0x01 /* 6 data bits */
|
|
|
|
|
#define CFCR_5BITS 0x00 /* 5 data bits */
|
|
|
|
|
|
|
|
|
|
/* modem control register */
|
|
|
|
|
#define MCR_LOOPBACK 0x10 /* loopback */
|
|
|
|
|
#define MCR_IENABLE 0x08 /* output 2 = int enable */
|
|
|
|
|
#define MCR_DRS 0x04 /* output 1 = xxx */
|
|
|
|
|
#define MCR_RTS 0x02 /* enable RTS */
|
|
|
|
|
#define MCR_DTR 0x01 /* enable DTR */
|
|
|
|
|
|
|
|
|
|
/* line status register */
|
|
|
|
|
#define LSR_RCV_FIFO 0x80 /* error in receive fifo */
|
|
|
|
|
#define LSR_TSRE 0x40 /* transmitter empty */
|
|
|
|
|
#define LSR_TXRDY 0x20 /* transmitter ready */
|
|
|
|
|
#define LSR_BI 0x10 /* break detected */
|
|
|
|
|
#define LSR_FE 0x08 /* framing error */
|
|
|
|
|
#define LSR_PE 0x04 /* parity error */
|
|
|
|
|
#define LSR_OE 0x02 /* overrun error */
|
|
|
|
|
#define LSR_RXRDY 0x01 /* receiver ready */
|
|
|
|
|
#define LSR_RCV_MASK 0x1f
|
|
|
|
|
|
|
|
|
|
/* modem status register */
|
|
|
|
|
#define MSR_DCD 0x80
|
|
|
|
|
#define MSR_RI 0x40
|
|
|
|
|
#define MSR_DSR 0x20
|
|
|
|
|
#define MSR_CTS 0x10
|
|
|
|
|
#define MSR_DDCD 0x08
|
|
|
|
|
#define MSR_TERI 0x04
|
|
|
|
|
#define MSR_DDSR 0x02
|
|
|
|
|
#define MSR_DCTS 0x01
|
|
|
|
|
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
#include <time.h>
|
1999-05-05 16:45:51 +02:00
|
|
|
|
#include <dos.h>
|
|
|
|
|
#include <go32.h>
|
|
|
|
|
#include <dpmi.h>
|
|
|
|
|
typedef unsigned long u_long;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* 16550 rx fifo trigger point */
|
|
|
|
|
#define FIFO_TRIGGER FIFO_TRIGGER_4
|
|
|
|
|
|
|
|
|
|
/* input buffer size */
|
|
|
|
|
#define CBSIZE 4096
|
|
|
|
|
|
|
|
|
|
#define RAWHZ 18
|
|
|
|
|
|
|
|
|
|
#ifdef DOS_STATS
|
|
|
|
|
#define CNT_RX 16
|
|
|
|
|
#define CNT_TX 17
|
|
|
|
|
#define CNT_STRAY 18
|
|
|
|
|
#define CNT_ORUN 19
|
|
|
|
|
#define NCNT 20
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
static int intrcnt;
|
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
2013-04-19 17:26:17 +02:00
|
|
|
|
static size_t cnts[NCNT];
|
1999-07-07 22:19:36 +02:00
|
|
|
|
static char *cntnames[NCNT] =
|
|
|
|
|
{
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* h/w interrupt counts. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
"mlsc", "nopend", "txrdy", "?3",
|
|
|
|
|
"rxrdy", "?5", "rls", "?7",
|
|
|
|
|
"?8", "?9", "?a", "?b",
|
|
|
|
|
"rxtout", "?d", "?e", "?f",
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* s/w counts. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
"rxcnt", "txcnt", "stray", "swoflo"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define COUNT(x) cnts[x]++
|
|
|
|
|
#else
|
1999-07-07 22:19:36 +02:00
|
|
|
|
#define COUNT(x)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Main interrupt controller port addresses. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#define ICU_BASE 0x20
|
|
|
|
|
#define ICU_OCW2 (ICU_BASE + 0)
|
|
|
|
|
#define ICU_MASK (ICU_BASE + 1)
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Original interrupt controller mask register. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
unsigned char icu_oldmask;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Maximum of 8 interrupts (we don't handle the slave icu yet). */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#define NINTR 8
|
|
|
|
|
|
|
|
|
|
static struct intrupt
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
|
|
|
|
char inuse;
|
|
|
|
|
struct dos_ttystate *port;
|
|
|
|
|
_go32_dpmi_seginfo old_rmhandler;
|
|
|
|
|
_go32_dpmi_seginfo old_pmhandler;
|
|
|
|
|
_go32_dpmi_seginfo new_rmhandler;
|
|
|
|
|
_go32_dpmi_seginfo new_pmhandler;
|
|
|
|
|
_go32_dpmi_registers regs;
|
|
|
|
|
}
|
|
|
|
|
intrupts[NINTR];
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct dos_ttystate
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
|
|
|
|
int base;
|
|
|
|
|
int irq;
|
|
|
|
|
int refcnt;
|
|
|
|
|
struct intrupt *intrupt;
|
|
|
|
|
int fifo;
|
|
|
|
|
int baudrate;
|
|
|
|
|
unsigned char cbuf[CBSIZE];
|
|
|
|
|
unsigned int first;
|
|
|
|
|
unsigned int count;
|
|
|
|
|
int txbusy;
|
|
|
|
|
unsigned char old_mcr;
|
|
|
|
|
int ferr;
|
|
|
|
|
int perr;
|
|
|
|
|
int oflo;
|
|
|
|
|
int msr;
|
|
|
|
|
}
|
|
|
|
|
ports[4] =
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
2000-03-19 12:24:41 +01:00
|
|
|
|
COM1ADDR, 4, 0, NULL, 0, 0, "", 0, 0, 0, 0, 0, 0, 0, 0
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
|
|
|
|
,
|
|
|
|
|
{
|
2000-03-19 12:24:41 +01:00
|
|
|
|
COM2ADDR, 3, 0, NULL, 0, 0, "", 0, 0, 0, 0, 0, 0, 0, 0
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
|
|
|
|
,
|
|
|
|
|
{
|
2000-03-19 12:24:41 +01:00
|
|
|
|
COM3ADDR, 4, 0, NULL, 0, 0, "", 0, 0, 0, 0, 0, 0, 0, 0
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
|
|
|
|
,
|
|
|
|
|
{
|
2000-03-19 12:24:41 +01:00
|
|
|
|
COM4ADDR, 3, 0, NULL, 0, 0, "", 0, 0, 0, 0, 0, 0, 0, 0
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
};
|
|
|
|
|
|
2001-07-11 19:52:32 +02:00
|
|
|
|
static int dos_open (struct serial *scb, const char *name);
|
|
|
|
|
static void dos_raw (struct serial *scb);
|
|
|
|
|
static int dos_readchar (struct serial *scb, int timeout);
|
|
|
|
|
static int dos_setbaudrate (struct serial *scb, int rate);
|
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
2013-04-19 17:26:17 +02:00
|
|
|
|
static int dos_write (struct serial *scb, const void *buf, size_t count);
|
2001-07-11 19:52:32 +02:00
|
|
|
|
static void dos_close (struct serial *scb);
|
|
|
|
|
static serial_ttystate dos_get_tty_state (struct serial *scb);
|
|
|
|
|
static int dos_set_tty_state (struct serial *scb, serial_ttystate state);
|
2000-05-25 15:55:48 +02:00
|
|
|
|
static int dos_baudconv (int rate);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
#define inb(p,a) inportb((p)->base + (a))
|
|
|
|
|
#define outb(p,a,v) outportb((p)->base + (a), (v))
|
|
|
|
|
#define disable() asm volatile ("cli");
|
|
|
|
|
#define enable() asm volatile ("sti");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dos_getc (volatile struct dos_ttystate *port)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
int c;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (port->count == 0)
|
|
|
|
|
return -1;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
c = port->cbuf[port->first];
|
|
|
|
|
disable ();
|
|
|
|
|
port->first = (port->first + 1) & (CBSIZE - 1);
|
|
|
|
|
port->count--;
|
|
|
|
|
enable ();
|
|
|
|
|
return c;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dos_putc (int c, struct dos_ttystate *port)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (port->count >= CBSIZE - 1)
|
|
|
|
|
return -1;
|
|
|
|
|
port->cbuf[(port->first + port->count) & (CBSIZE - 1)] = c;
|
|
|
|
|
port->count++;
|
|
|
|
|
return 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dos_comisr (int irq)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct dos_ttystate *port;
|
|
|
|
|
unsigned char iir, lsr, c;
|
|
|
|
|
|
|
|
|
|
disable (); /* Paranoia */
|
|
|
|
|
outportb (ICU_OCW2, 0x20); /* End-Of-Interrupt */
|
|
|
|
|
#ifdef DOS_STATS
|
|
|
|
|
++intrcnt;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
port = intrupts[irq].port;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (!port)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
COUNT (CNT_STRAY);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
return; /* not open */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
iir = inb (port, com_iir) & IIR_IMASK;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
switch (iir)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case IIR_RLS:
|
|
|
|
|
lsr = inb (port, com_lsr);
|
|
|
|
|
goto rx;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case IIR_RXTOUT:
|
|
|
|
|
case IIR_RXRDY:
|
|
|
|
|
lsr = 0;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
rx:
|
|
|
|
|
do
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
c = inb (port, com_data);
|
|
|
|
|
if (lsr & (LSR_BI | LSR_FE | LSR_PE | LSR_OE))
|
|
|
|
|
{
|
|
|
|
|
if (lsr & (LSR_BI | LSR_FE))
|
|
|
|
|
port->ferr++;
|
|
|
|
|
else if (lsr & LSR_PE)
|
|
|
|
|
port->perr++;
|
|
|
|
|
if (lsr & LSR_OE)
|
|
|
|
|
port->oflo++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dos_putc (c, port) < 0)
|
|
|
|
|
{
|
|
|
|
|
COUNT (CNT_ORUN);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
COUNT (CNT_RX);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while ((lsr = inb (port, com_lsr)) & LSR_RXRDY);
|
|
|
|
|
break;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case IIR_MLSC:
|
|
|
|
|
/* could be used to flowcontrol Tx */
|
|
|
|
|
port->msr = inb (port, com_msr);
|
|
|
|
|
break;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case IIR_TXRDY:
|
|
|
|
|
port->txbusy = 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case IIR_NOPEND:
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* No more pending interrupts, all done. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
default:
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Unexpected interrupt, ignore. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
COUNT (iir);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define ISRNAME(x) dos_comisr##x
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
#define ISR(x) static void ISRNAME(x)(void) {dos_comisr(x);}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-01-18 Andrew Cagney <ac131313@redhat.com>
* cris-tdep.c: Fix function declaration indentation.
* dwarfread.c, gdbcore.h, gdbtypes.h, i386v-nat.c: Ditto.
* mips-tdep.c, monitor.h, parse.c, proc-utils.h: Ditto.
* rs6000-nat.c, ser-go32.c, somread.c, stabsread.c: Ditto.
* symfile.h, symtab.h, target.c, target.h, value.h: Ditto.
* xcoffread.c, config/pa/tm-hppa.h: Ditto.
* config/sparc/tm-sp64.h, config/sparc/tm-sparc.h: Ditto.
2003-01-19 05:06:47 +01:00
|
|
|
|
ISR (0) ISR (1) ISR (2) ISR (3) /* OK */
|
|
|
|
|
ISR (4) ISR (5) ISR (6) ISR (7) /* OK */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
typedef void (*isr_t) (void);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
static isr_t isrs[NINTR] =
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
ISRNAME (0), ISRNAME (1), ISRNAME (2), ISRNAME (3),
|
|
|
|
|
ISRNAME (4), ISRNAME (5), ISRNAME (6), ISRNAME (7)
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
};
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
static struct intrupt *
|
|
|
|
|
dos_hookirq (unsigned int irq)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct intrupt *intr;
|
|
|
|
|
unsigned int vec;
|
|
|
|
|
isr_t isr;
|
|
|
|
|
|
|
|
|
|
if (irq >= NINTR)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
intr = &intrupts[irq];
|
|
|
|
|
if (intr->inuse)
|
|
|
|
|
return 0;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
vec = 0x08 + irq;
|
|
|
|
|
isr = isrs[irq];
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Setup real mode handler. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
_go32_dpmi_get_real_mode_interrupt_vector (vec, &intr->old_rmhandler);
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
intr->new_rmhandler.pm_selector = _go32_my_cs ();
|
|
|
|
|
intr->new_rmhandler.pm_offset = (u_long) isr;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (_go32_dpmi_allocate_real_mode_callback_iret (&intr->new_rmhandler,
|
|
|
|
|
&intr->regs))
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (_go32_dpmi_set_real_mode_interrupt_vector (vec, &intr->new_rmhandler))
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Setup protected mode handler. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
_go32_dpmi_get_protected_mode_interrupt_vector (vec, &intr->old_pmhandler);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
intr->new_pmhandler.pm_selector = _go32_my_cs ();
|
|
|
|
|
intr->new_pmhandler.pm_offset = (u_long) isr;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
_go32_dpmi_allocate_iret_wrapper (&intr->new_pmhandler);
|
|
|
|
|
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
if (_go32_dpmi_set_protected_mode_interrupt_vector (vec,
|
|
|
|
|
&intr->new_pmhandler))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Setup interrupt controller mask. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
disable ();
|
|
|
|
|
outportb (ICU_MASK, inportb (ICU_MASK) & ~(1 << irq));
|
|
|
|
|
enable ();
|
|
|
|
|
|
|
|
|
|
intr->inuse = 1;
|
|
|
|
|
return intr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dos_unhookirq (struct intrupt *intr)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned int irq, vec;
|
|
|
|
|
unsigned char mask;
|
|
|
|
|
|
|
|
|
|
irq = intr - intrupts;
|
|
|
|
|
vec = 0x08 + irq;
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Restore old interrupt mask bit. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
mask = 1 << irq;
|
|
|
|
|
disable ();
|
|
|
|
|
outportb (ICU_MASK, inportb (ICU_MASK) | (mask & icu_oldmask));
|
|
|
|
|
enable ();
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Remove real mode handler. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
_go32_dpmi_set_real_mode_interrupt_vector (vec, &intr->old_rmhandler);
|
|
|
|
|
_go32_dpmi_free_real_mode_callback (&intr->new_rmhandler);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Remove protected mode handler. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
_go32_dpmi_set_protected_mode_interrupt_vector (vec, &intr->old_pmhandler);
|
|
|
|
|
_go32_dpmi_free_iret_wrapper (&intr->new_pmhandler);
|
|
|
|
|
intr->inuse = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static int
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_open (struct serial *scb, const char *name)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct dos_ttystate *port;
|
|
|
|
|
int fd, i;
|
|
|
|
|
|
|
|
|
|
if (strncasecmp (name, "/dev/", 5) == 0)
|
|
|
|
|
name += 5;
|
|
|
|
|
else if (strncasecmp (name, "\\dev\\", 5) == 0)
|
|
|
|
|
name += 5;
|
|
|
|
|
|
|
|
|
|
if (strlen (name) != 4 || strncasecmp (name, "com", 3) != 0)
|
|
|
|
|
{
|
|
|
|
|
errno = ENOENT;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (name[3] < '1' || name[3] > '4')
|
|
|
|
|
{
|
|
|
|
|
errno = ENOENT;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-15 12:10:52 +01:00
|
|
|
|
/* FIXME: this is a Bad Idea (tm)! One should *never* invent file
|
|
|
|
|
handles, since they might be already used by other files/devices.
|
|
|
|
|
The Right Way to do this is to create a real handle by dup()'ing
|
|
|
|
|
some existing one. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
fd = name[3] - '1';
|
|
|
|
|
port = &ports[fd];
|
|
|
|
|
if (port->refcnt++ > 0)
|
|
|
|
|
{
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Device already opened another user. Just point at it. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
scb->fd = fd;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Force access to ID reg. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
outb (port, com_cfcr, 0);
|
|
|
|
|
outb (port, com_iir, 0);
|
|
|
|
|
for (i = 0; i < 17; i++)
|
|
|
|
|
{
|
|
|
|
|
if ((inb (port, com_iir) & 0x38) == 0)
|
|
|
|
|
goto ok;
|
|
|
|
|
(void) inb (port, com_data); /* clear recv */
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
errno = ENODEV;
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
ok:
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Disable all interrupts in chip. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
outb (port, com_ier, 0);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Tentatively enable 16550 fifo, and see if it responds. */
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
outb (port, com_fifo,
|
|
|
|
|
FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
sleep (1);
|
|
|
|
|
port->fifo = ((inb (port, com_iir) & IIR_FIFO_MASK) == IIR_FIFO_MASK);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* clear pending status reports. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
(void) inb (port, com_lsr);
|
|
|
|
|
(void) inb (port, com_msr);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Enable external interrupt gate (to avoid floating IRQ). */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
outb (port, com_mcr, MCR_IENABLE);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Hook up interrupt handler and initialise icu. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
port->intrupt = dos_hookirq (port->irq);
|
|
|
|
|
if (!port->intrupt)
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
outb (port, com_mcr, 0);
|
|
|
|
|
outb (port, com_fifo, 0);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
errno = ENODEV;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
disable ();
|
|
|
|
|
|
|
|
|
|
/* record port */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
port->intrupt->port = port;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
scb->fd = fd;
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Clear rx buffer, tx busy flag and overflow count. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
port->first = port->count = 0;
|
|
|
|
|
port->txbusy = 0;
|
|
|
|
|
port->oflo = 0;
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Set default baud rate and mode: 9600,8,n,1 */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
i = dos_baudconv (port->baudrate = 9600);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
outb (port, com_cfcr, CFCR_DLAB);
|
|
|
|
|
outb (port, com_dlbl, i & 0xff);
|
|
|
|
|
outb (port, com_dlbh, i >> 8);
|
|
|
|
|
outb (port, com_cfcr, CFCR_8BITS);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Enable all interrupts. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
outb (port, com_ier, IER_ETXRDY | IER_ERXRDY | IER_ERLS | IER_EMSC);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Enable DTR & RTS. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
outb (port, com_mcr, MCR_DTR | MCR_RTS | MCR_IENABLE);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
enable ();
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_close (struct serial *scb)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct dos_ttystate *port;
|
|
|
|
|
struct intrupt *intrupt;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (!scb)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
port = &ports[scb->fd];
|
|
|
|
|
|
|
|
|
|
if (port->refcnt-- > 1)
|
|
|
|
|
return;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (!(intrupt = port->intrupt))
|
|
|
|
|
return;
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Disable interrupts, fifo, flow control. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
disable ();
|
|
|
|
|
port->intrupt = 0;
|
|
|
|
|
intrupt->port = 0;
|
|
|
|
|
outb (port, com_fifo, 0);
|
|
|
|
|
outb (port, com_ier, 0);
|
|
|
|
|
enable ();
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Unhook handler, and disable interrupt gate. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
dos_unhookirq (intrupt);
|
|
|
|
|
outb (port, com_mcr, 0);
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Check for overflow errors. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (port->oflo)
|
|
|
|
|
{
|
|
|
|
|
fprintf_unfiltered (gdb_stderr,
|
|
|
|
|
"Serial input overruns occurred.\n");
|
|
|
|
|
fprintf_unfiltered (gdb_stderr, "This system %s handle %d baud.\n",
|
|
|
|
|
port->fifo ? "cannot" : "needs a 16550 to",
|
|
|
|
|
port->baudrate);
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
2016-07-21 14:02:34 +02:00
|
|
|
|
/* Implementation of the serial_ops flush_output method. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static int
|
2016-07-21 14:02:34 +02:00
|
|
|
|
dos_flush_output (struct serial *scb)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Implementation of the serial_ops setparity method. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dos_setparity (struct serial *scb, int parity)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Implementation of the serial_ops drain_output method. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dos_drain_output (struct serial *scb)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_raw (struct serial *scb)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Always in raw mode. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_readchar (struct serial *scb, int timeout)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct dos_ttystate *port = &ports[scb->fd];
|
|
|
|
|
long then;
|
|
|
|
|
int c;
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
then = rawclock () + (timeout * RAWHZ);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while ((c = dos_getc (port)) < 0)
|
|
|
|
|
{
|
target remote: Don't rely on immediate_quit (introduce quit handlers)
remote.c is the last user of immediate_quit. It's relied on to
immediately break the initial remote connection sync up, if the user
does Ctrl-C, assuming that was because the target isn't responding.
At that stage, since the connection isn't synced yet, disconnecting is
the only safe thing to do. This commit reworks that, to not rely on
throwing from the SIGINT signal handler.
So, this commit:
- Introduces the concept of a "quit handler". This is used to
override what does the QUIT macro do when the quit flag is set.
- Makes the "struct serial" reachar / write code call QUIT in the
partial read/write loops, so the current quit handler is invoked
whenever a serial->read_prim / serial->write_prim returns EINTR.
- Makes the "struct serial" reachar / write code call
interruptible_select instead of gdb_select, so that QUITs are
detected in a race-free manner.
- Stops remote.c from setting immediate_quit during the initial
connection.
- Instead, we install a custom quit handler whenever we're calling
into the serial code. This custom quit handler knows to immediately
throw a quit when we're in the initial connection setup, and
otherwise defer handling the quit/Ctrl-C request to later, when
we're safely out of a packet command/response sequence. This also
is what is now responsible for handling "double Ctrl-C because
target connection is stuck/wedged."
- remote.c no longer installs a specialized SIGINT handlers, and
instead re-uses the quit flag. Since we want to rely on the QUIT
macro, the SIGINT handler must also set the quit. And the easiest
is just to not install custom SIGINT handler in remote.c. Let the
standard SIGINT handler do its job of setting the quit flag.
Centralizing SIGINT handlers seems like a good thing to me, anyway.
gdb/ChangeLog:
2016-04-12 Pedro Alves <palves@redhat.com>
* defs.h (quit_handler_ftype, quit_handler)
(make_cleanup_override_quit_handler, default_quit_handler): New.
(QUIT): Adjust comments.
* event-top.c (default_quit_handler): New function.
(quit_handler): New global.
(struct quit_handler_cleanup_data): New.
(restore_quit_handler, restore_quit_handler_dtor)
(make_cleanup_override_quit_handler): New.
(async_request_quit): Call QUIT.
* remote.c (struct remote_state) <got_ctrlc_during_io>: New field.
(async_sigint_remote_twice_token, async_sigint_remote_token):
Delete.
(remote_close): Update comments.
(remote_start_remote): Don't set immediate_quit. Set starting_up
earlier.
(remote_serial_quit_handler, remote_unpush_and_throw): New
functions.
(remote_open_1): Clear got_ctrlc_during_io. Set
remote_async_terminal_ours_p unconditionally.
(async_initialize_sigint_signal_handler)
(async_handle_remote_sigint, async_handle_remote_sigint_twice)
(remote_check_pending_interrupt, async_remote_interrupt)
(async_remote_interrupt_twice)
(async_cleanup_sigint_signal_handler, ofunc)
(sync_remote_interrupt, sync_remote_interrupt_twice): Delete.
(remote_terminal_inferior, remote_terminal_ours): Remove async
checks.
(remote_wait_as): Don't install a SIGINT handler in sync mode.
(readchar, remote_serial_write): Override the quit handler with
remote_serial_quit_handler.
(getpkt_or_notif_sane_1): Don't call QUIT.
(initialize_remote_ops): Don't install
remote_check_pending_interrupt.
(_initialize_remote): Don't create async_sigint_remote_token and
async_sigint_remote_twice_token.
* ser-base.c (ser_base_wait_for): Call QUIT and use
interruptible_select.
(ser_base_write): Call QUIT.
* ser-go32.c (dos_readchar, dos_write): Call QUIT.
* ser-unix.c (wait_for): Don't use VTIME. Always take the
gdb_select path, but call QUIT and interruptible_select.
* utils.c (maybe_quit): Call the current quit handler. Don't call
target_check_pending_interrupt.
(defaulted_query, prompt_for_continue): Override the quit handler
with the default quit handler.
2016-04-12 17:49:32 +02:00
|
|
|
|
QUIT;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (timeout >= 0 && (rawclock () - then) >= 0)
|
|
|
|
|
return SERIAL_TIMEOUT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return c;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static serial_ttystate
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_get_tty_state (struct serial *scb)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct dos_ttystate *port = &ports[scb->fd];
|
|
|
|
|
struct dos_ttystate *state;
|
|
|
|
|
|
2000-03-15 12:10:52 +01:00
|
|
|
|
/* Are they asking about a port we opened? */
|
|
|
|
|
if (port->refcnt <= 0)
|
|
|
|
|
{
|
|
|
|
|
/* We've never heard about this port. We should fail this call,
|
|
|
|
|
unless they are asking about one of the 3 standard handles,
|
|
|
|
|
in which case we pretend the handle was open by us if it is
|
|
|
|
|
connected to a terminal device. This is beacuse Unix
|
|
|
|
|
terminals use the serial interface, so GDB expects the
|
|
|
|
|
standard handles to go through here. */
|
|
|
|
|
if (scb->fd >= 3 || !isatty (scb->fd))
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
Replace some xmalloc-family functions with XNEW-family ones
This patch is part of the make-gdb-buildable-in-C++ effort. The idea is
to change some calls to the xmalloc family of functions to calls to the
equivalents in the XNEW family. This avoids adding an explicit cast, so
it keeps the code a bit more readable. Some of them also map relatively
well to a C++ equivalent (XNEW (struct foo) -> new foo), so it will be
possible to do scripted replacements if needed.
I only changed calls that were obviously allocating memory for one or
multiple "objects". Allocation of variable sizes (such as strings or
buffer handling) will be for later (and won't use XNEW).
- xmalloc (sizeof (struct foo)) -> XNEW (struct foo)
- xmalloc (num * sizeof (struct foo)) -> XNEWVEC (struct foo, num)
- xcalloc (1, sizeof (struct foo)) -> XCNEW (struct foo)
- xcalloc (num, sizeof (struct foo)) -> XCNEWVEC (struct foo, num)
- xrealloc (p, num * sizeof (struct foo) -> XRESIZEVEC (struct foo, p, num)
- obstack_alloc (ob, sizeof (struct foo)) -> XOBNEW (ob, struct foo)
- obstack_alloc (ob, num * sizeof (struct foo)) -> XOBNEWVEC (ob, struct foo, num)
- alloca (sizeof (struct foo)) -> XALLOCA (struct foo)
- alloca (num * sizeof (struct foo)) -> XALLOCAVEC (struct foo, num)
Some instances of xmalloc followed by memset to zero the buffer were
replaced by XCNEW or XCNEWVEC.
I regtested on x86-64, Ubuntu 14.04, but the patch touches many
architecture-specific files. For those I'll have to rely on the
buildbot or people complaining that I broke their gdb.
gdb/ChangeLog:
* aarch64-linux-nat.c (aarch64_add_process): Likewise.
* aarch64-tdep.c (aarch64_gdbarch_init): Likewise.
* ada-exp.y (write_ambiguous_var): Likewise.
* ada-lang.c (resolve_subexp): Likewise.
(user_select_syms): Likewise.
(assign_aggregate): Likewise.
(ada_evaluate_subexp): Likewise.
(cache_symbol): Likewise.
* addrmap.c (allocate_key): Likewise.
(addrmap_create_mutable): Likewise.
* aix-thread.c (sync_threadlists): Likewise.
* alpha-tdep.c (alpha_push_dummy_call): Likewise.
(alpha_gdbarch_init): Likewise.
* amd64-windows-tdep.c (amd64_windows_push_arguments): Likewise.
* arm-linux-nat.c (arm_linux_add_process): Likewise.
* arm-linux-tdep.c (arm_linux_displaced_step_copy_insn): Likewise.
* arm-tdep.c (push_stack_item): Likewise.
(arm_displaced_step_copy_insn): Likewise.
(arm_gdbarch_init): Likewise.
(_initialize_arm_tdep): Likewise.
* avr-tdep.c (push_stack_item): Likewise.
* ax-general.c (new_agent_expr): Likewise.
* block.c (block_initialize_namespace): Likewise.
* breakpoint.c (alloc_counted_command_line): Likewise.
(update_dprintf_command_list): Likewise.
(parse_breakpoint_sals): Likewise.
(decode_static_tracepoint_spec): Likewise.
(until_break_command): Likewise.
(clear_command): Likewise.
(update_global_location_list): Likewise.
(get_breakpoint_objfile_data) Likewise.
* btrace.c (ftrace_new_function): Likewise.
(btrace_set_insn_history): Likewise.
(btrace_set_call_history): Likewise.
* buildsym.c (add_symbol_to_list): Likewise.
(record_pending_block): Likewise.
(start_subfile): Likewise.
(start_buildsym_compunit): Likewise.
(push_subfile): Likewise.
(end_symtab_get_static_block): Likewise.
(buildsym_init): Likewise.
* cli/cli-cmds.c (source_command): Likewise.
* cli/cli-decode.c (add_cmd): Likewise.
* cli/cli-script.c (build_command_line): Likewise.
(setup_user_args): Likewise.
(realloc_body_list): Likewise.
(process_next_line): Likewise.
(copy_command_lines): Likewise.
* cli/cli-setshow.c (do_set_command): Likewise.
* coff-pe-read.c (read_pe_exported_syms): Likewise.
* coffread.c (coff_locate_sections): Likewise.
(coff_symtab_read): Likewise.
(coff_read_struct_type): Likewise.
* common/cleanups.c (make_my_cleanup2): Likewise.
* common/common-exceptions.c (throw_it): Likewise.
* common/filestuff.c (make_cleanup_close): Likewise.
* common/format.c (parse_format_string): Likewise.
* common/queue.h (DEFINE_QUEUE_P): Likewise.
* compile/compile-object-load.c (munmap_list_add): Likewise.
(compile_object_load): Likewise.
* compile/compile-object-run.c (compile_object_run): Likewise.
* compile/compile.c (append_args): Likewise.
* corefile.c (specify_exec_file_hook): Likewise.
* cp-support.c (make_symbol_overload_list): Likewise.
* cris-tdep.c (push_stack_item): Likewise.
(cris_gdbarch_init): Likewise.
* ctf.c (ctf_trace_file_writer_new): Likewise.
* dbxread.c (init_header_files): Likewise.
(add_new_header_file): Likewise.
(init_bincl_list): Likewise.
(dbx_end_psymtab): Likewise.
(start_psymtab): Likewise.
(dbx_end_psymtab): Likewise.
* dcache.c (dcache_init): Likewise.
* dictionary.c (dict_create_hashed): Likewise.
(dict_create_hashed_expandable): Likewise.
(dict_create_linear): Likewise.
(dict_create_linear_expandable): Likewise.
* dtrace-probe.c (dtrace_process_dof_probe): Likewise.
* dummy-frame.c (register_dummy_frame_dtor): Likewise.
* dwarf2-frame-tailcall.c (cache_new_ref1): Likewise.
* dwarf2-frame.c (dwarf2_build_frame_info): Likewise.
(decode_frame_entry_1): Likewise.
* dwarf2expr.c (new_dwarf_expr_context): Likewise.
* dwarf2loc.c (dwarf2_compile_expr_to_ax): Likewise.
* dwarf2read.c (dwarf2_has_info): Likewise.
(create_signatured_type_table_from_index): Likewise.
(dwarf2_read_index): Likewise.
(dw2_get_file_names_reader): Likewise.
(create_all_type_units): Likewise.
(read_cutu_die_from_dwo): Likewise.
(init_tu_and_read_dwo_dies): Likewise.
(init_cutu_and_read_dies): Likewise.
(create_all_comp_units): Likewise.
(queue_comp_unit): Likewise.
(inherit_abstract_dies): Likewise.
(read_call_site_scope): Likewise.
(dwarf2_add_field): Likewise.
(dwarf2_add_typedef): Likewise.
(dwarf2_add_member_fn): Likewise.
(attr_to_dynamic_prop): Likewise.
(abbrev_table_alloc_abbrev): Likewise.
(abbrev_table_read_table): Likewise.
(add_include_dir): Likewise.
(add_file_name): Likewise.
(dwarf_decode_line_header): Likewise.
(dwarf2_const_value_attr): Likewise.
(dwarf_alloc_block): Likewise.
(parse_macro_definition): Likewise.
(set_die_type): Likewise.
(write_psymtabs_to_index): Likewise.
(create_cus_from_index): Likewise.
(dwarf2_create_include_psymtab): Likewise.
(process_psymtab_comp_unit_reader): Likewise.
(build_type_psymtab_dependencies): Likewise.
(read_comp_units_from_section): Likewise.
(compute_compunit_symtab_includes): Likewise.
(create_dwo_unit_in_dwp_v1): Likewise.
(create_dwo_unit_in_dwp_v2): Likewise.
(read_func_scope): Likewise.
(process_structure_scope): Likewise.
(mark_common_block_symbol_computed): Likewise.
(load_partial_dies): Likewise.
(dwarf2_symbol_mark_computed): Likewise.
* elfread.c (elf_symfile_segments): Likewise.
(elf_read_minimal_symbols): Likewise.
* environ.c (make_environ): Likewise.
* eval.c (evaluate_subexp_standard): Likewise.
* event-loop.c (create_file_handler): Likewise.
(create_async_signal_handler): Likewise.
(create_async_event_handler): Likewise.
(create_timer): Likewise.
* exec.c (build_section_table): Likewise.
* fbsd-nat.c (fbsd_remember_child): Likewise.
* fork-child.c (fork_inferior): Likewise.
* frv-tdep.c (new_variant): Likewise.
* gdbarch.sh (gdbarch_alloc): Likewise.
(append_name): Likewise.
* gdbtypes.c (rank_function): Likewise.
(copy_type_recursive): Likewise.
(add_dyn_prop): Likewise.
* gnu-nat.c (make_proc): Likewise.
(make_inf): Likewise.
(gnu_write_inferior): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
(build_std_type_info_type): Likewise.
* guile/scm-param.c (compute_enum_list): Likewise.
* guile/scm-utils.c (gdbscm_parse_function_args): Likewise.
* guile/scm-value.c (gdbscm_value_call): Likewise.
* h8300-tdep.c (h8300_gdbarch_init): Likewise.
* hppa-tdep.c (hppa_init_objfile_priv_data): Likewise.
(read_unwind_info): Likewise.
* ia64-tdep.c (ia64_gdbarch_init): Likewise.
* infcall.c (dummy_frame_context_saver_setup): Likewise.
(call_function_by_hand_dummy): Likewise.
* infcmd.c (step_once): Likewise.
(finish_forward): Likewise.
(attach_command): Likewise.
(notice_new_inferior): Likewise.
* inferior.c (add_inferior_silent): Likewise.
* infrun.c (add_displaced_stepping_state): Likewise.
(save_infcall_control_state): Likewise.
(save_inferior_ptid): Likewise.
(_initialize_infrun): Likewise.
* jit.c (bfd_open_from_target_memory): Likewise.
(jit_gdbarch_data_init): Likewise.
* language.c (add_language): Likewise.
* linespec.c (decode_line_2): Likewise.
* linux-nat.c (add_to_pid_list): Likewise.
(add_initial_lwp): Likewise.
* linux-thread-db.c (add_thread_db_info): Likewise.
(record_thread): Likewise.
(info_auto_load_libthread_db): Likewise.
* m32c-tdep.c (m32c_gdbarch_init): Likewise.
* m68hc11-tdep.c (m68hc11_gdbarch_init): Likewise.
* m68k-tdep.c (m68k_gdbarch_init): Likewise.
* m88k-tdep.c (m88k_analyze_prologue): Likewise.
* macrocmd.c (macro_define_command): Likewise.
* macroexp.c (gather_arguments): Likewise.
* macroscope.c (sal_macro_scope): Likewise.
* macrotab.c (new_macro_table): Likewise.
* mdebugread.c (push_parse_stack): Likewise.
(parse_partial_symbols): Likewise.
(parse_symbol): Likewise.
(psymtab_to_symtab_1): Likewise.
(new_block): Likewise.
(new_psymtab): Likewise.
(mdebug_build_psymtabs): Likewise.
(add_pending): Likewise.
(elfmdebug_build_psymtabs): Likewise.
* mep-tdep.c (mep_gdbarch_init): Likewise.
* mi/mi-main.c (mi_execute_command): Likewise.
* mi/mi-parse.c (mi_parse_argv): Likewise.
* minidebug.c (lzma_open): Likewise.
* minsyms.c (terminate_minimal_symbol_table): Likewise.
* mips-linux-nat.c (mips_linux_insert_watchpoint): Likewise.
* mips-tdep.c (mips_gdbarch_init): Likewise.
* mn10300-tdep.c (mn10300_gdbarch_init): Likewise.
* msp430-tdep.c (msp430_gdbarch_init): Likewise.
* mt-tdep.c (mt_registers_info): Likewise.
* nat/aarch64-linux.c (aarch64_linux_new_thread): Likewise.
* nat/linux-btrace.c (linux_enable_bts): Likewise.
(linux_enable_pt): Likewise.
* nat/linux-osdata.c (linux_xfer_osdata_processes): Likewise.
(linux_xfer_osdata_processgroups): Likewise.
* nios2-tdep.c (nios2_gdbarch_init): Likewise.
* nto-procfs.c (procfs_meminfo): Likewise.
* objc-lang.c (start_msglist): Likewise.
(selectors_info): Likewise.
(classes_info): Likewise.
(find_methods): Likewise.
* objfiles.c (allocate_objfile): Likewise.
(update_section_map): Likewise.
* osabi.c (gdbarch_register_osabi): Likewise.
(gdbarch_register_osabi_sniffer): Likewise.
* parse.c (start_arglist): Likewise.
* ppc-linux-nat.c (hwdebug_find_thread_points_by_tid): Likewise.
(hwdebug_insert_point): Likewise.
* printcmd.c (display_command): Likewise.
(ui_printf): Likewise.
* procfs.c (create_procinfo): Likewise.
(load_syscalls): Likewise.
(proc_get_LDT_entry): Likewise.
(proc_update_threads): Likewise.
* prologue-value.c (make_pv_area): Likewise.
(pv_area_store): Likewise.
* psymtab.c (extend_psymbol_list): Likewise.
(init_psymbol_list): Likewise.
(allocate_psymtab): Likewise.
* python/py-inferior.c (add_thread_object): Likewise.
* python/py-param.c (compute_enum_values): Likewise.
* python/py-value.c (valpy_call): Likewise.
* python/py-varobj.c (py_varobj_iter_next): Likewise.
* python/python.c (ensure_python_env): Likewise.
* record-btrace.c (record_btrace_start_replaying): Likewise.
* record-full.c (record_full_reg_alloc): Likewise.
(record_full_mem_alloc): Likewise.
(record_full_end_alloc): Likewise.
(record_full_core_xfer_partial): Likewise.
* regcache.c (get_thread_arch_aspace_regcache): Likewise.
* remote-fileio.c (remote_fileio_init_fd_map): Likewise.
* remote-notif.c (remote_notif_state_allocate): Likewise.
* remote.c (demand_private_info): Likewise.
(remote_notif_stop_alloc_reply): Likewise.
(remote_enable_btrace): Likewise.
* reverse.c (save_bookmark_command): Likewise.
* rl78-tdep.c (rl78_gdbarch_init): Likewise.
* rx-tdep.c (rx_gdbarch_init): Likewise.
* s390-linux-nat.c (s390_insert_watchpoint): Likewise.
* ser-go32.c (dos_get_tty_state): Likewise.
(dos_copy_tty_state): Likewise.
* ser-mingw.c (ser_windows_open): Likewise.
(ser_console_wait_handle): Likewise.
(ser_console_get_tty_state): Likewise.
(make_pipe_state): Likewise.
(net_windows_open): Likewise.
* ser-unix.c (hardwire_get_tty_state): Likewise.
(hardwire_copy_tty_state): Likewise.
* solib-aix.c (solib_aix_new_lm_info): Likewise.
* solib-dsbt.c (dsbt_current_sos): Likewise.
(dsbt_relocate_main_executable): Likewise.
* solib-frv.c (frv_current_sos): Likewise.
(frv_relocate_main_executable): Likewise.
* solib-spu.c (spu_bfd_fopen): Likewise.
* solib-svr4.c (lm_info_read): Likewise.
(svr4_copy_library_list): Likewise.
(svr4_default_sos): Likewise.
* source.c (find_source_lines): Likewise.
(line_info): Likewise.
(add_substitute_path_rule): Likewise.
* spu-linux-nat.c (spu_bfd_open): Likewise.
* spu-tdep.c (info_spu_dma_cmdlist): Likewise.
* stabsread.c (dbx_lookup_type): Likewise.
(read_type): Likewise.
(read_member_functions): Likewise.
(read_struct_fields): Likewise.
(read_baseclasses): Likewise.
(read_args): Likewise.
(_initialize_stabsread): Likewise.
* stack.c (func_command): Likewise.
* stap-probe.c (handle_stap_probe): Likewise.
* symfile.c (addrs_section_sort): Likewise.
(addr_info_make_relative): Likewise.
(load_section_callback): Likewise.
(add_symbol_file_command): Likewise.
(init_filename_language_table): Likewise.
* symtab.c (create_filename_seen_cache): Likewise.
(sort_search_symbols_remove_dups): Likewise.
(search_symbols): Likewise.
* target.c (make_cleanup_restore_target_terminal): Likewise.
* thread.c (new_thread): Likewise.
(enable_thread_stack_temporaries): Likewise.
(make_cleanup_restore_current_thread): Likewise.
(thread_apply_all_command): Likewise.
* tic6x-tdep.c (tic6x_gdbarch_init): Likewise.
* top.c (gdb_readline_wrapper): Likewise.
* tracefile-tfile.c (tfile_trace_file_writer_new): Likewise.
* tracepoint.c (trace_find_line_command): Likewise.
(all_tracepoint_actions_and_cleanup): Likewise.
(make_cleanup_restore_current_traceframe): Likewise.
(get_uploaded_tp): Likewise.
(get_uploaded_tsv): Likewise.
* tui/tui-data.c (tui_alloc_generic_win_info): Likewise.
(tui_alloc_win_info): Likewise.
(tui_alloc_content): Likewise.
(tui_add_content_elements): Likewise.
* tui/tui-disasm.c (tui_find_disassembly_address): Likewise.
(tui_set_disassem_content): Likewise.
* ui-file.c (ui_file_new): Likewise.
(stdio_file_new): Likewise.
(tee_file_new): Likewise.
* utils.c (make_cleanup_restore_integer): Likewise.
(add_internal_problem_command): Likewise.
* v850-tdep.c (v850_gdbarch_init): Likewise.
* valops.c (find_oload_champ): Likewise.
* value.c (allocate_value_lazy): Likewise.
(record_latest_value): Likewise.
(create_internalvar): Likewise.
* varobj.c (install_variable): Likewise.
(new_variable): Likewise.
(new_root_variable): Likewise.
(cppush): Likewise.
(_initialize_varobj): Likewise.
* windows-nat.c (windows_make_so): Likewise.
* x86-nat.c (x86_add_process): Likewise.
* xcoffread.c (arrange_linetable): Likewise.
(allocate_include_entry): Likewise.
(process_linenos): Likewise.
(SYMBOL_DUP): Likewise.
(xcoff_start_psymtab): Likewise.
(xcoff_end_psymtab): Likewise.
* xml-support.c (gdb_xml_parse_attr_ulongest): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* gdbarch.c: Regenerate.
* gdbarch.h: Regenerate.
gdb/gdbserver/ChangeLog:
* ax.c (gdb_parse_agent_expr): Likewise.
(compile_bytecodes): Likewise.
* dll.c (loaded_dll): Likewise.
* event-loop.c (append_callback_event): Likewise.
(create_file_handler): Likewise.
(create_file_event): Likewise.
* hostio.c (handle_open): Likewise.
* inferiors.c (add_thread): Likewise.
(add_process): Likewise.
* linux-aarch64-low.c (aarch64_linux_new_process): Likewise.
* linux-arm-low.c (arm_new_process): Likewise.
(arm_new_thread): Likewise.
* linux-low.c (add_to_pid_list): Likewise.
(linux_add_process): Likewise.
(handle_extended_wait): Likewise.
(add_lwp): Likewise.
(enqueue_one_deferred_signal): Likewise.
(enqueue_pending_signal): Likewise.
(linux_resume_one_lwp_throw): Likewise.
(linux_resume_one_thread): Likewise.
(linux_read_memory): Likewise.
(linux_write_memory): Likewise.
* linux-mips-low.c (mips_linux_new_process): Likewise.
(mips_linux_new_thread): Likewise.
(mips_add_watchpoint): Likewise.
* linux-x86-low.c (initialize_low_arch): Likewise.
* lynx-low.c (lynx_add_process): Likewise.
* mem-break.c (set_raw_breakpoint_at): Likewise.
(set_breakpoint): Likewise.
(add_condition_to_breakpoint): Likewise.
(add_commands_to_breakpoint): Likewise.
(clone_agent_expr): Likewise.
(clone_one_breakpoint): Likewise.
* regcache.c (new_register_cache): Likewise.
* remote-utils.c (look_up_one_symbol): Likewise.
* server.c (queue_stop_reply): Likewise.
(start_inferior): Likewise.
(queue_stop_reply_callback): Likewise.
(handle_target_event): Likewise.
* spu-low.c (fetch_ppc_memory): Likewise.
(store_ppc_memory): Likewise.
* target.c (set_target_ops): Likewise.
* thread-db.c (thread_db_load_search): Likewise.
(try_thread_db_load_1): Likewise.
* tracepoint.c (add_tracepoint): Likewise.
(add_tracepoint_action): Likewise.
(create_trace_state_variable): Likewise.
(cmd_qtdpsrc): Likewise.
(cmd_qtro): Likewise.
(add_while_stepping_state): Likewise.
* win32-low.c (child_add_thread): Likewise.
(get_image_name): Likewise.
2015-08-26 23:16:07 +02:00
|
|
|
|
state = XNEW (struct dos_ttystate);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
*state = *port;
|
|
|
|
|
return (serial_ttystate) state;
|
|
|
|
|
}
|
|
|
|
|
|
2011-03-04 20:23:42 +01:00
|
|
|
|
static serial_ttystate
|
|
|
|
|
dos_copy_tty_state (struct serial *scb, serial_ttystate ttystate)
|
|
|
|
|
{
|
|
|
|
|
struct dos_ttystate *state;
|
|
|
|
|
|
Replace some xmalloc-family functions with XNEW-family ones
This patch is part of the make-gdb-buildable-in-C++ effort. The idea is
to change some calls to the xmalloc family of functions to calls to the
equivalents in the XNEW family. This avoids adding an explicit cast, so
it keeps the code a bit more readable. Some of them also map relatively
well to a C++ equivalent (XNEW (struct foo) -> new foo), so it will be
possible to do scripted replacements if needed.
I only changed calls that were obviously allocating memory for one or
multiple "objects". Allocation of variable sizes (such as strings or
buffer handling) will be for later (and won't use XNEW).
- xmalloc (sizeof (struct foo)) -> XNEW (struct foo)
- xmalloc (num * sizeof (struct foo)) -> XNEWVEC (struct foo, num)
- xcalloc (1, sizeof (struct foo)) -> XCNEW (struct foo)
- xcalloc (num, sizeof (struct foo)) -> XCNEWVEC (struct foo, num)
- xrealloc (p, num * sizeof (struct foo) -> XRESIZEVEC (struct foo, p, num)
- obstack_alloc (ob, sizeof (struct foo)) -> XOBNEW (ob, struct foo)
- obstack_alloc (ob, num * sizeof (struct foo)) -> XOBNEWVEC (ob, struct foo, num)
- alloca (sizeof (struct foo)) -> XALLOCA (struct foo)
- alloca (num * sizeof (struct foo)) -> XALLOCAVEC (struct foo, num)
Some instances of xmalloc followed by memset to zero the buffer were
replaced by XCNEW or XCNEWVEC.
I regtested on x86-64, Ubuntu 14.04, but the patch touches many
architecture-specific files. For those I'll have to rely on the
buildbot or people complaining that I broke their gdb.
gdb/ChangeLog:
* aarch64-linux-nat.c (aarch64_add_process): Likewise.
* aarch64-tdep.c (aarch64_gdbarch_init): Likewise.
* ada-exp.y (write_ambiguous_var): Likewise.
* ada-lang.c (resolve_subexp): Likewise.
(user_select_syms): Likewise.
(assign_aggregate): Likewise.
(ada_evaluate_subexp): Likewise.
(cache_symbol): Likewise.
* addrmap.c (allocate_key): Likewise.
(addrmap_create_mutable): Likewise.
* aix-thread.c (sync_threadlists): Likewise.
* alpha-tdep.c (alpha_push_dummy_call): Likewise.
(alpha_gdbarch_init): Likewise.
* amd64-windows-tdep.c (amd64_windows_push_arguments): Likewise.
* arm-linux-nat.c (arm_linux_add_process): Likewise.
* arm-linux-tdep.c (arm_linux_displaced_step_copy_insn): Likewise.
* arm-tdep.c (push_stack_item): Likewise.
(arm_displaced_step_copy_insn): Likewise.
(arm_gdbarch_init): Likewise.
(_initialize_arm_tdep): Likewise.
* avr-tdep.c (push_stack_item): Likewise.
* ax-general.c (new_agent_expr): Likewise.
* block.c (block_initialize_namespace): Likewise.
* breakpoint.c (alloc_counted_command_line): Likewise.
(update_dprintf_command_list): Likewise.
(parse_breakpoint_sals): Likewise.
(decode_static_tracepoint_spec): Likewise.
(until_break_command): Likewise.
(clear_command): Likewise.
(update_global_location_list): Likewise.
(get_breakpoint_objfile_data) Likewise.
* btrace.c (ftrace_new_function): Likewise.
(btrace_set_insn_history): Likewise.
(btrace_set_call_history): Likewise.
* buildsym.c (add_symbol_to_list): Likewise.
(record_pending_block): Likewise.
(start_subfile): Likewise.
(start_buildsym_compunit): Likewise.
(push_subfile): Likewise.
(end_symtab_get_static_block): Likewise.
(buildsym_init): Likewise.
* cli/cli-cmds.c (source_command): Likewise.
* cli/cli-decode.c (add_cmd): Likewise.
* cli/cli-script.c (build_command_line): Likewise.
(setup_user_args): Likewise.
(realloc_body_list): Likewise.
(process_next_line): Likewise.
(copy_command_lines): Likewise.
* cli/cli-setshow.c (do_set_command): Likewise.
* coff-pe-read.c (read_pe_exported_syms): Likewise.
* coffread.c (coff_locate_sections): Likewise.
(coff_symtab_read): Likewise.
(coff_read_struct_type): Likewise.
* common/cleanups.c (make_my_cleanup2): Likewise.
* common/common-exceptions.c (throw_it): Likewise.
* common/filestuff.c (make_cleanup_close): Likewise.
* common/format.c (parse_format_string): Likewise.
* common/queue.h (DEFINE_QUEUE_P): Likewise.
* compile/compile-object-load.c (munmap_list_add): Likewise.
(compile_object_load): Likewise.
* compile/compile-object-run.c (compile_object_run): Likewise.
* compile/compile.c (append_args): Likewise.
* corefile.c (specify_exec_file_hook): Likewise.
* cp-support.c (make_symbol_overload_list): Likewise.
* cris-tdep.c (push_stack_item): Likewise.
(cris_gdbarch_init): Likewise.
* ctf.c (ctf_trace_file_writer_new): Likewise.
* dbxread.c (init_header_files): Likewise.
(add_new_header_file): Likewise.
(init_bincl_list): Likewise.
(dbx_end_psymtab): Likewise.
(start_psymtab): Likewise.
(dbx_end_psymtab): Likewise.
* dcache.c (dcache_init): Likewise.
* dictionary.c (dict_create_hashed): Likewise.
(dict_create_hashed_expandable): Likewise.
(dict_create_linear): Likewise.
(dict_create_linear_expandable): Likewise.
* dtrace-probe.c (dtrace_process_dof_probe): Likewise.
* dummy-frame.c (register_dummy_frame_dtor): Likewise.
* dwarf2-frame-tailcall.c (cache_new_ref1): Likewise.
* dwarf2-frame.c (dwarf2_build_frame_info): Likewise.
(decode_frame_entry_1): Likewise.
* dwarf2expr.c (new_dwarf_expr_context): Likewise.
* dwarf2loc.c (dwarf2_compile_expr_to_ax): Likewise.
* dwarf2read.c (dwarf2_has_info): Likewise.
(create_signatured_type_table_from_index): Likewise.
(dwarf2_read_index): Likewise.
(dw2_get_file_names_reader): Likewise.
(create_all_type_units): Likewise.
(read_cutu_die_from_dwo): Likewise.
(init_tu_and_read_dwo_dies): Likewise.
(init_cutu_and_read_dies): Likewise.
(create_all_comp_units): Likewise.
(queue_comp_unit): Likewise.
(inherit_abstract_dies): Likewise.
(read_call_site_scope): Likewise.
(dwarf2_add_field): Likewise.
(dwarf2_add_typedef): Likewise.
(dwarf2_add_member_fn): Likewise.
(attr_to_dynamic_prop): Likewise.
(abbrev_table_alloc_abbrev): Likewise.
(abbrev_table_read_table): Likewise.
(add_include_dir): Likewise.
(add_file_name): Likewise.
(dwarf_decode_line_header): Likewise.
(dwarf2_const_value_attr): Likewise.
(dwarf_alloc_block): Likewise.
(parse_macro_definition): Likewise.
(set_die_type): Likewise.
(write_psymtabs_to_index): Likewise.
(create_cus_from_index): Likewise.
(dwarf2_create_include_psymtab): Likewise.
(process_psymtab_comp_unit_reader): Likewise.
(build_type_psymtab_dependencies): Likewise.
(read_comp_units_from_section): Likewise.
(compute_compunit_symtab_includes): Likewise.
(create_dwo_unit_in_dwp_v1): Likewise.
(create_dwo_unit_in_dwp_v2): Likewise.
(read_func_scope): Likewise.
(process_structure_scope): Likewise.
(mark_common_block_symbol_computed): Likewise.
(load_partial_dies): Likewise.
(dwarf2_symbol_mark_computed): Likewise.
* elfread.c (elf_symfile_segments): Likewise.
(elf_read_minimal_symbols): Likewise.
* environ.c (make_environ): Likewise.
* eval.c (evaluate_subexp_standard): Likewise.
* event-loop.c (create_file_handler): Likewise.
(create_async_signal_handler): Likewise.
(create_async_event_handler): Likewise.
(create_timer): Likewise.
* exec.c (build_section_table): Likewise.
* fbsd-nat.c (fbsd_remember_child): Likewise.
* fork-child.c (fork_inferior): Likewise.
* frv-tdep.c (new_variant): Likewise.
* gdbarch.sh (gdbarch_alloc): Likewise.
(append_name): Likewise.
* gdbtypes.c (rank_function): Likewise.
(copy_type_recursive): Likewise.
(add_dyn_prop): Likewise.
* gnu-nat.c (make_proc): Likewise.
(make_inf): Likewise.
(gnu_write_inferior): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
(build_std_type_info_type): Likewise.
* guile/scm-param.c (compute_enum_list): Likewise.
* guile/scm-utils.c (gdbscm_parse_function_args): Likewise.
* guile/scm-value.c (gdbscm_value_call): Likewise.
* h8300-tdep.c (h8300_gdbarch_init): Likewise.
* hppa-tdep.c (hppa_init_objfile_priv_data): Likewise.
(read_unwind_info): Likewise.
* ia64-tdep.c (ia64_gdbarch_init): Likewise.
* infcall.c (dummy_frame_context_saver_setup): Likewise.
(call_function_by_hand_dummy): Likewise.
* infcmd.c (step_once): Likewise.
(finish_forward): Likewise.
(attach_command): Likewise.
(notice_new_inferior): Likewise.
* inferior.c (add_inferior_silent): Likewise.
* infrun.c (add_displaced_stepping_state): Likewise.
(save_infcall_control_state): Likewise.
(save_inferior_ptid): Likewise.
(_initialize_infrun): Likewise.
* jit.c (bfd_open_from_target_memory): Likewise.
(jit_gdbarch_data_init): Likewise.
* language.c (add_language): Likewise.
* linespec.c (decode_line_2): Likewise.
* linux-nat.c (add_to_pid_list): Likewise.
(add_initial_lwp): Likewise.
* linux-thread-db.c (add_thread_db_info): Likewise.
(record_thread): Likewise.
(info_auto_load_libthread_db): Likewise.
* m32c-tdep.c (m32c_gdbarch_init): Likewise.
* m68hc11-tdep.c (m68hc11_gdbarch_init): Likewise.
* m68k-tdep.c (m68k_gdbarch_init): Likewise.
* m88k-tdep.c (m88k_analyze_prologue): Likewise.
* macrocmd.c (macro_define_command): Likewise.
* macroexp.c (gather_arguments): Likewise.
* macroscope.c (sal_macro_scope): Likewise.
* macrotab.c (new_macro_table): Likewise.
* mdebugread.c (push_parse_stack): Likewise.
(parse_partial_symbols): Likewise.
(parse_symbol): Likewise.
(psymtab_to_symtab_1): Likewise.
(new_block): Likewise.
(new_psymtab): Likewise.
(mdebug_build_psymtabs): Likewise.
(add_pending): Likewise.
(elfmdebug_build_psymtabs): Likewise.
* mep-tdep.c (mep_gdbarch_init): Likewise.
* mi/mi-main.c (mi_execute_command): Likewise.
* mi/mi-parse.c (mi_parse_argv): Likewise.
* minidebug.c (lzma_open): Likewise.
* minsyms.c (terminate_minimal_symbol_table): Likewise.
* mips-linux-nat.c (mips_linux_insert_watchpoint): Likewise.
* mips-tdep.c (mips_gdbarch_init): Likewise.
* mn10300-tdep.c (mn10300_gdbarch_init): Likewise.
* msp430-tdep.c (msp430_gdbarch_init): Likewise.
* mt-tdep.c (mt_registers_info): Likewise.
* nat/aarch64-linux.c (aarch64_linux_new_thread): Likewise.
* nat/linux-btrace.c (linux_enable_bts): Likewise.
(linux_enable_pt): Likewise.
* nat/linux-osdata.c (linux_xfer_osdata_processes): Likewise.
(linux_xfer_osdata_processgroups): Likewise.
* nios2-tdep.c (nios2_gdbarch_init): Likewise.
* nto-procfs.c (procfs_meminfo): Likewise.
* objc-lang.c (start_msglist): Likewise.
(selectors_info): Likewise.
(classes_info): Likewise.
(find_methods): Likewise.
* objfiles.c (allocate_objfile): Likewise.
(update_section_map): Likewise.
* osabi.c (gdbarch_register_osabi): Likewise.
(gdbarch_register_osabi_sniffer): Likewise.
* parse.c (start_arglist): Likewise.
* ppc-linux-nat.c (hwdebug_find_thread_points_by_tid): Likewise.
(hwdebug_insert_point): Likewise.
* printcmd.c (display_command): Likewise.
(ui_printf): Likewise.
* procfs.c (create_procinfo): Likewise.
(load_syscalls): Likewise.
(proc_get_LDT_entry): Likewise.
(proc_update_threads): Likewise.
* prologue-value.c (make_pv_area): Likewise.
(pv_area_store): Likewise.
* psymtab.c (extend_psymbol_list): Likewise.
(init_psymbol_list): Likewise.
(allocate_psymtab): Likewise.
* python/py-inferior.c (add_thread_object): Likewise.
* python/py-param.c (compute_enum_values): Likewise.
* python/py-value.c (valpy_call): Likewise.
* python/py-varobj.c (py_varobj_iter_next): Likewise.
* python/python.c (ensure_python_env): Likewise.
* record-btrace.c (record_btrace_start_replaying): Likewise.
* record-full.c (record_full_reg_alloc): Likewise.
(record_full_mem_alloc): Likewise.
(record_full_end_alloc): Likewise.
(record_full_core_xfer_partial): Likewise.
* regcache.c (get_thread_arch_aspace_regcache): Likewise.
* remote-fileio.c (remote_fileio_init_fd_map): Likewise.
* remote-notif.c (remote_notif_state_allocate): Likewise.
* remote.c (demand_private_info): Likewise.
(remote_notif_stop_alloc_reply): Likewise.
(remote_enable_btrace): Likewise.
* reverse.c (save_bookmark_command): Likewise.
* rl78-tdep.c (rl78_gdbarch_init): Likewise.
* rx-tdep.c (rx_gdbarch_init): Likewise.
* s390-linux-nat.c (s390_insert_watchpoint): Likewise.
* ser-go32.c (dos_get_tty_state): Likewise.
(dos_copy_tty_state): Likewise.
* ser-mingw.c (ser_windows_open): Likewise.
(ser_console_wait_handle): Likewise.
(ser_console_get_tty_state): Likewise.
(make_pipe_state): Likewise.
(net_windows_open): Likewise.
* ser-unix.c (hardwire_get_tty_state): Likewise.
(hardwire_copy_tty_state): Likewise.
* solib-aix.c (solib_aix_new_lm_info): Likewise.
* solib-dsbt.c (dsbt_current_sos): Likewise.
(dsbt_relocate_main_executable): Likewise.
* solib-frv.c (frv_current_sos): Likewise.
(frv_relocate_main_executable): Likewise.
* solib-spu.c (spu_bfd_fopen): Likewise.
* solib-svr4.c (lm_info_read): Likewise.
(svr4_copy_library_list): Likewise.
(svr4_default_sos): Likewise.
* source.c (find_source_lines): Likewise.
(line_info): Likewise.
(add_substitute_path_rule): Likewise.
* spu-linux-nat.c (spu_bfd_open): Likewise.
* spu-tdep.c (info_spu_dma_cmdlist): Likewise.
* stabsread.c (dbx_lookup_type): Likewise.
(read_type): Likewise.
(read_member_functions): Likewise.
(read_struct_fields): Likewise.
(read_baseclasses): Likewise.
(read_args): Likewise.
(_initialize_stabsread): Likewise.
* stack.c (func_command): Likewise.
* stap-probe.c (handle_stap_probe): Likewise.
* symfile.c (addrs_section_sort): Likewise.
(addr_info_make_relative): Likewise.
(load_section_callback): Likewise.
(add_symbol_file_command): Likewise.
(init_filename_language_table): Likewise.
* symtab.c (create_filename_seen_cache): Likewise.
(sort_search_symbols_remove_dups): Likewise.
(search_symbols): Likewise.
* target.c (make_cleanup_restore_target_terminal): Likewise.
* thread.c (new_thread): Likewise.
(enable_thread_stack_temporaries): Likewise.
(make_cleanup_restore_current_thread): Likewise.
(thread_apply_all_command): Likewise.
* tic6x-tdep.c (tic6x_gdbarch_init): Likewise.
* top.c (gdb_readline_wrapper): Likewise.
* tracefile-tfile.c (tfile_trace_file_writer_new): Likewise.
* tracepoint.c (trace_find_line_command): Likewise.
(all_tracepoint_actions_and_cleanup): Likewise.
(make_cleanup_restore_current_traceframe): Likewise.
(get_uploaded_tp): Likewise.
(get_uploaded_tsv): Likewise.
* tui/tui-data.c (tui_alloc_generic_win_info): Likewise.
(tui_alloc_win_info): Likewise.
(tui_alloc_content): Likewise.
(tui_add_content_elements): Likewise.
* tui/tui-disasm.c (tui_find_disassembly_address): Likewise.
(tui_set_disassem_content): Likewise.
* ui-file.c (ui_file_new): Likewise.
(stdio_file_new): Likewise.
(tee_file_new): Likewise.
* utils.c (make_cleanup_restore_integer): Likewise.
(add_internal_problem_command): Likewise.
* v850-tdep.c (v850_gdbarch_init): Likewise.
* valops.c (find_oload_champ): Likewise.
* value.c (allocate_value_lazy): Likewise.
(record_latest_value): Likewise.
(create_internalvar): Likewise.
* varobj.c (install_variable): Likewise.
(new_variable): Likewise.
(new_root_variable): Likewise.
(cppush): Likewise.
(_initialize_varobj): Likewise.
* windows-nat.c (windows_make_so): Likewise.
* x86-nat.c (x86_add_process): Likewise.
* xcoffread.c (arrange_linetable): Likewise.
(allocate_include_entry): Likewise.
(process_linenos): Likewise.
(SYMBOL_DUP): Likewise.
(xcoff_start_psymtab): Likewise.
(xcoff_end_psymtab): Likewise.
* xml-support.c (gdb_xml_parse_attr_ulongest): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* gdbarch.c: Regenerate.
* gdbarch.h: Regenerate.
gdb/gdbserver/ChangeLog:
* ax.c (gdb_parse_agent_expr): Likewise.
(compile_bytecodes): Likewise.
* dll.c (loaded_dll): Likewise.
* event-loop.c (append_callback_event): Likewise.
(create_file_handler): Likewise.
(create_file_event): Likewise.
* hostio.c (handle_open): Likewise.
* inferiors.c (add_thread): Likewise.
(add_process): Likewise.
* linux-aarch64-low.c (aarch64_linux_new_process): Likewise.
* linux-arm-low.c (arm_new_process): Likewise.
(arm_new_thread): Likewise.
* linux-low.c (add_to_pid_list): Likewise.
(linux_add_process): Likewise.
(handle_extended_wait): Likewise.
(add_lwp): Likewise.
(enqueue_one_deferred_signal): Likewise.
(enqueue_pending_signal): Likewise.
(linux_resume_one_lwp_throw): Likewise.
(linux_resume_one_thread): Likewise.
(linux_read_memory): Likewise.
(linux_write_memory): Likewise.
* linux-mips-low.c (mips_linux_new_process): Likewise.
(mips_linux_new_thread): Likewise.
(mips_add_watchpoint): Likewise.
* linux-x86-low.c (initialize_low_arch): Likewise.
* lynx-low.c (lynx_add_process): Likewise.
* mem-break.c (set_raw_breakpoint_at): Likewise.
(set_breakpoint): Likewise.
(add_condition_to_breakpoint): Likewise.
(add_commands_to_breakpoint): Likewise.
(clone_agent_expr): Likewise.
(clone_one_breakpoint): Likewise.
* regcache.c (new_register_cache): Likewise.
* remote-utils.c (look_up_one_symbol): Likewise.
* server.c (queue_stop_reply): Likewise.
(start_inferior): Likewise.
(queue_stop_reply_callback): Likewise.
(handle_target_event): Likewise.
* spu-low.c (fetch_ppc_memory): Likewise.
(store_ppc_memory): Likewise.
* target.c (set_target_ops): Likewise.
* thread-db.c (thread_db_load_search): Likewise.
(try_thread_db_load_1): Likewise.
* tracepoint.c (add_tracepoint): Likewise.
(add_tracepoint_action): Likewise.
(create_trace_state_variable): Likewise.
(cmd_qtdpsrc): Likewise.
(cmd_qtro): Likewise.
(add_while_stepping_state): Likewise.
* win32-low.c (child_add_thread): Likewise.
(get_image_name): Likewise.
2015-08-26 23:16:07 +02:00
|
|
|
|
state = XNEW (struct dos_ttystate);
|
2011-03-04 20:23:42 +01:00
|
|
|
|
*state = *(struct dos_ttystate *) ttystate;
|
|
|
|
|
|
|
|
|
|
return (serial_ttystate) state;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static int
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_set_tty_state (struct serial *scb, serial_ttystate ttystate)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct dos_ttystate *state;
|
|
|
|
|
|
|
|
|
|
state = (struct dos_ttystate *) ttystate;
|
|
|
|
|
dos_setbaudrate (scb, state->baudrate);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_noflush_set_tty_state (struct serial *scb, serial_ttystate new_ttystate,
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
serial_ttystate old_ttystate)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct dos_ttystate *state;
|
|
|
|
|
|
|
|
|
|
state = (struct dos_ttystate *) new_ttystate;
|
|
|
|
|
dos_setbaudrate (scb, state->baudrate);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_flush_input (struct serial *scb)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct dos_ttystate *port = &ports[scb->fd];
|
2010-05-17 01:49:58 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
disable ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
port->first = port->count = 0;
|
|
|
|
|
if (port->fifo)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
outb (port, com_fifo, FIFO_ENABLE | FIFO_RCV_RST | FIFO_TRIGGER);
|
|
|
|
|
enable ();
|
2000-02-29 08:45:13 +01:00
|
|
|
|
return 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_print_tty_state (struct serial *scb, serial_ttystate ttystate,
|
* config/djgpp/djconfig.sh: Add copyright notice.
* ser-go32.c (rawclock): Remove prototype; include time.h instead.
(ISR, dos_hookirq, isr_t): Convert K&R definition to ANSI C.
(top level) <string.h>: Include gdb_string.h instead.
(dos_noop, dos_raw, dos_noflush_set_tty_state)
(dos_print_tty_state, dos_info): Remove ATTRIBUTE_UNUSED.
* go32-nat.c (go32_create_inferior): Move the declaration of
`environ' to here from the top level.
(top level) <_initialize_go32_nat>: Remove redundant prototype.
<gdb_string.h>: Include it instead of string.h.
(store_register): Call register_buffer instead of accessing
registers[] directly.
(redir_cmdline_delete, redir_cmdline_parse, redir_to_debugger)
(redir_to_debugger, redir_debug_init) [__DJGPP_MINOR__ < 3]: Put
the function names at the start of the line.
(go32_set_dr): Throw internal_error if the argument is not a valid
debug register number.
(go32_open, go32_close, go32_attach, go32_detach, go32_resume)
(go32_wait, go32_xfer_memory, go32_files_info)
(go32_terminal_info): Remove ATTRIBUTE_UNUSED.
2001-03-26 13:26:45 +02:00
|
|
|
|
struct ui_file *stream)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Nothing to print. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dos_baudconv (int rate)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
long x, err;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
if (rate <= 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return -1;
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
#define divrnd(n, q) (((n) * 2 / (q) + 1) / 2) /* Divide and round off. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
x = divrnd (COMTICK, rate);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (x <= 0)
|
|
|
|
|
return -1;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
err = divrnd (1000 * COMTICK, x * rate) - 1000;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (err < 0)
|
|
|
|
|
err = -err;
|
|
|
|
|
if (err > SPEED_TOLERANCE)
|
|
|
|
|
return -1;
|
|
|
|
|
#undef divrnd
|
|
|
|
|
return x;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_setbaudrate (struct serial *scb, int rate)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct dos_ttystate *port = &ports[scb->fd];
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (port->baudrate != rate)
|
|
|
|
|
{
|
|
|
|
|
int x;
|
|
|
|
|
unsigned char cfcr;
|
|
|
|
|
|
|
|
|
|
x = dos_baudconv (rate);
|
|
|
|
|
if (x <= 0)
|
|
|
|
|
{
|
|
|
|
|
fprintf_unfiltered (gdb_stderr, "%d: impossible baudrate\n", rate);
|
|
|
|
|
errno = EINVAL;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
disable ();
|
|
|
|
|
cfcr = inb (port, com_cfcr);
|
|
|
|
|
|
|
|
|
|
outb (port, com_cfcr, CFCR_DLAB);
|
|
|
|
|
outb (port, com_dlbl, x & 0xff);
|
|
|
|
|
outb (port, com_dlbh, x >> 8);
|
|
|
|
|
outb (port, com_cfcr, cfcr);
|
|
|
|
|
port->baudrate = rate;
|
|
|
|
|
enable ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_setstopbits (struct serial *scb, int num)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct dos_ttystate *port = &ports[scb->fd];
|
|
|
|
|
unsigned char cfcr;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
disable ();
|
|
|
|
|
cfcr = inb (port, com_cfcr);
|
|
|
|
|
|
|
|
|
|
switch (num)
|
|
|
|
|
{
|
|
|
|
|
case SERIAL_1_STOPBITS:
|
|
|
|
|
outb (port, com_cfcr, cfcr & ~CFCR_STOPB);
|
|
|
|
|
break;
|
|
|
|
|
case SERIAL_1_AND_A_HALF_STOPBITS:
|
|
|
|
|
case SERIAL_2_STOPBITS:
|
|
|
|
|
outb (port, com_cfcr, cfcr | CFCR_STOPB);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
enable ();
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
enable ();
|
|
|
|
|
|
|
|
|
|
return 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
2013-04-19 17:26:17 +02:00
|
|
|
|
dos_write (struct serial *scb, const void *buf, size_t count)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
volatile struct dos_ttystate *port = &ports[scb->fd];
|
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
2013-04-19 17:26:17 +02:00
|
|
|
|
size_t fifosize = port->fifo ? 16 : 1;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
long then;
|
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
2013-04-19 17:26:17 +02:00
|
|
|
|
size_t cnt;
|
2016-07-21 14:02:34 +02:00
|
|
|
|
const char *str = (const char *) buf;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
2013-04-19 17:26:17 +02:00
|
|
|
|
while (count > 0)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
target remote: Don't rely on immediate_quit (introduce quit handlers)
remote.c is the last user of immediate_quit. It's relied on to
immediately break the initial remote connection sync up, if the user
does Ctrl-C, assuming that was because the target isn't responding.
At that stage, since the connection isn't synced yet, disconnecting is
the only safe thing to do. This commit reworks that, to not rely on
throwing from the SIGINT signal handler.
So, this commit:
- Introduces the concept of a "quit handler". This is used to
override what does the QUIT macro do when the quit flag is set.
- Makes the "struct serial" reachar / write code call QUIT in the
partial read/write loops, so the current quit handler is invoked
whenever a serial->read_prim / serial->write_prim returns EINTR.
- Makes the "struct serial" reachar / write code call
interruptible_select instead of gdb_select, so that QUITs are
detected in a race-free manner.
- Stops remote.c from setting immediate_quit during the initial
connection.
- Instead, we install a custom quit handler whenever we're calling
into the serial code. This custom quit handler knows to immediately
throw a quit when we're in the initial connection setup, and
otherwise defer handling the quit/Ctrl-C request to later, when
we're safely out of a packet command/response sequence. This also
is what is now responsible for handling "double Ctrl-C because
target connection is stuck/wedged."
- remote.c no longer installs a specialized SIGINT handlers, and
instead re-uses the quit flag. Since we want to rely on the QUIT
macro, the SIGINT handler must also set the quit. And the easiest
is just to not install custom SIGINT handler in remote.c. Let the
standard SIGINT handler do its job of setting the quit flag.
Centralizing SIGINT handlers seems like a good thing to me, anyway.
gdb/ChangeLog:
2016-04-12 Pedro Alves <palves@redhat.com>
* defs.h (quit_handler_ftype, quit_handler)
(make_cleanup_override_quit_handler, default_quit_handler): New.
(QUIT): Adjust comments.
* event-top.c (default_quit_handler): New function.
(quit_handler): New global.
(struct quit_handler_cleanup_data): New.
(restore_quit_handler, restore_quit_handler_dtor)
(make_cleanup_override_quit_handler): New.
(async_request_quit): Call QUIT.
* remote.c (struct remote_state) <got_ctrlc_during_io>: New field.
(async_sigint_remote_twice_token, async_sigint_remote_token):
Delete.
(remote_close): Update comments.
(remote_start_remote): Don't set immediate_quit. Set starting_up
earlier.
(remote_serial_quit_handler, remote_unpush_and_throw): New
functions.
(remote_open_1): Clear got_ctrlc_during_io. Set
remote_async_terminal_ours_p unconditionally.
(async_initialize_sigint_signal_handler)
(async_handle_remote_sigint, async_handle_remote_sigint_twice)
(remote_check_pending_interrupt, async_remote_interrupt)
(async_remote_interrupt_twice)
(async_cleanup_sigint_signal_handler, ofunc)
(sync_remote_interrupt, sync_remote_interrupt_twice): Delete.
(remote_terminal_inferior, remote_terminal_ours): Remove async
checks.
(remote_wait_as): Don't install a SIGINT handler in sync mode.
(readchar, remote_serial_write): Override the quit handler with
remote_serial_quit_handler.
(getpkt_or_notif_sane_1): Don't call QUIT.
(initialize_remote_ops): Don't install
remote_check_pending_interrupt.
(_initialize_remote): Don't create async_sigint_remote_token and
async_sigint_remote_twice_token.
* ser-base.c (ser_base_wait_for): Call QUIT and use
interruptible_select.
(ser_base_write): Call QUIT.
* ser-go32.c (dos_readchar, dos_write): Call QUIT.
* ser-unix.c (wait_for): Don't use VTIME. Always take the
gdb_select path, but call QUIT and interruptible_select.
* utils.c (maybe_quit): Call the current quit handler. Don't call
target_check_pending_interrupt.
(defaulted_query, prompt_for_continue): Override the quit handler
with the default quit handler.
2016-04-12 17:49:32 +02:00
|
|
|
|
QUIT;
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Send the data, fifosize bytes at a time. */
|
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
2013-04-19 17:26:17 +02:00
|
|
|
|
cnt = fifosize > count ? count : fifosize;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
port->txbusy = 1;
|
2001-02-04 08:48:18 +01:00
|
|
|
|
/* Francisco Pastor <fpastor.etra-id@etra.es> says OUTSB messes
|
|
|
|
|
up the communications with UARTs with FIFOs. */
|
|
|
|
|
#ifdef UART_FIFO_WORKS
|
1999-07-07 22:19:36 +02:00
|
|
|
|
outportsb (port->base + com_data, str, cnt);
|
|
|
|
|
str += cnt;
|
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
2013-04-19 17:26:17 +02:00
|
|
|
|
count -= cnt;
|
2001-02-04 08:48:18 +01:00
|
|
|
|
#else
|
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
2013-04-19 17:26:17 +02:00
|
|
|
|
for ( ; cnt > 0; cnt--, count--)
|
2001-02-04 08:48:18 +01:00
|
|
|
|
outportb (port->base + com_data, *str++);
|
|
|
|
|
#endif
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#ifdef DOS_STATS
|
1999-07-07 22:19:36 +02:00
|
|
|
|
cnts[CNT_TX] += cnt;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#endif
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Wait for transmission to complete (max 1 sec). */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
then = rawclock () + RAWHZ;
|
|
|
|
|
while (port->txbusy)
|
|
|
|
|
{
|
|
|
|
|
if ((rawclock () - then) >= 0)
|
|
|
|
|
{
|
|
|
|
|
errno = EIO;
|
|
|
|
|
return SERIAL_ERROR;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2001-07-11 19:52:32 +02:00
|
|
|
|
dos_sendbreak (struct serial *scb)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
volatile struct dos_ttystate *port = &ports[scb->fd];
|
|
|
|
|
unsigned char cfcr;
|
|
|
|
|
long then;
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
cfcr = inb (port, com_cfcr);
|
|
|
|
|
outb (port, com_cfcr, cfcr | CFCR_SBREAK);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* 0.25 sec delay */
|
|
|
|
|
then = rawclock () + RAWHZ / 4;
|
|
|
|
|
while ((rawclock () - then) < 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
outb (port, com_cfcr, cfcr);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-12-06 18:58:50 +01:00
|
|
|
|
static const struct serial_ops dos_ops =
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
"hardwire",
|
|
|
|
|
dos_open,
|
|
|
|
|
dos_close,
|
2010-10-12 17:40:03 +02:00
|
|
|
|
NULL, /* fdopen, not implemented */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
dos_readchar,
|
|
|
|
|
dos_write,
|
2016-07-21 14:02:34 +02:00
|
|
|
|
dos_flush_output,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
dos_flush_input,
|
|
|
|
|
dos_sendbreak,
|
|
|
|
|
dos_raw,
|
|
|
|
|
dos_get_tty_state,
|
2011-03-04 20:23:42 +01:00
|
|
|
|
dos_copy_tty_state,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
dos_set_tty_state,
|
|
|
|
|
dos_print_tty_state,
|
|
|
|
|
dos_noflush_set_tty_state,
|
|
|
|
|
dos_setbaudrate,
|
|
|
|
|
dos_setstopbits,
|
2016-07-21 14:02:34 +02:00
|
|
|
|
dos_setparity,
|
|
|
|
|
dos_drain_output,
|
2011-01-11 22:53:25 +01:00
|
|
|
|
(void (*)(struct serial *, int))NULL /* Change into async mode. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
};
|
|
|
|
|
|
2010-08-20 20:49:20 +02:00
|
|
|
|
int
|
|
|
|
|
gdb_pipe (int pdes[2])
|
|
|
|
|
{
|
|
|
|
|
/* No support for pipes. */
|
|
|
|
|
errno = ENOSYS;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2017-08-22 22:09:55 +02:00
|
|
|
|
info_serial_command (char *arg, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct dos_ttystate *port;
|
2000-03-15 12:11:41 +01:00
|
|
|
|
#ifdef DOS_STATS
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int i;
|
2000-03-15 12:11:41 +01:00
|
|
|
|
#endif
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
for (port = ports; port < &ports[4]; port++)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (port->baudrate == 0)
|
|
|
|
|
continue;
|
2000-03-15 12:11:41 +01:00
|
|
|
|
printf_filtered ("Port:\tCOM%ld (%sactive)\n", (long)(port - ports) + 1,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
port->intrupt ? "" : "not ");
|
|
|
|
|
printf_filtered ("Addr:\t0x%03x (irq %d)\n", port->base, port->irq);
|
|
|
|
|
printf_filtered ("16550:\t%s\n", port->fifo ? "yes" : "no");
|
|
|
|
|
printf_filtered ("Speed:\t%d baud\n", port->baudrate);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
printf_filtered ("Errs:\tframing %d parity %d overflow %d\n\n",
|
1999-04-16 03:35:26 +02:00
|
|
|
|
port->ferr, port->perr, port->oflo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef DOS_STATS
|
|
|
|
|
printf_filtered ("\nTotal interrupts: %d\n", intrcnt);
|
|
|
|
|
for (i = 0; i < NCNT; i++)
|
|
|
|
|
if (cnts[i])
|
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
2013-04-19 17:26:17 +02:00
|
|
|
|
printf_filtered ("%s:\t%lu\n", cntnames[i], (unsigned long) cnts[i]);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
_initialize_ser_dos (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
serial_add_interface (&dos_ops);
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Save original interrupt mask register. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
icu_oldmask = inportb (ICU_MASK);
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Mark fixed motherboard irqs as inuse. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
intrupts[0].inuse = /* timer tick */
|
|
|
|
|
intrupts[1].inuse = /* keyboard */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
intrupts[2].inuse = 1; /* slave icu */
|
|
|
|
|
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_zinteger_cmd through out. Re-sync gdbarch.sh
and gdbarch.c.
* breakpoint.c, frame.c, gdb-events.sh, gdbarch.sh: Update.
* gdbtypes.c, infrun.c, linux-nat.c, maint.c, monitor.c: Update.
* pa64solib.c, parse.c, remote-mips.c, ser-go32.c: Update.
* serial.c, solib-frv.c, somsolib.c, target.c, top.c: Update.
* varobj.c, cli/cli-cmds.c: Update.
* gdbarch.c, gdb-events.c: Regenerate.
2005-02-18 19:58:56 +01:00
|
|
|
|
add_setshow_zinteger_cmd ("com1base", class_obscure, &ports[0].base, _("\
|
|
|
|
|
Set COM1 base i/o port address."), _("\
|
|
|
|
|
Show COM1 base i/o port address."), NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL, /* FIXME: i18n: */
|
|
|
|
|
&setlist, &showlist);
|
|
|
|
|
|
|
|
|
|
add_setshow_zinteger_cmd ("com1irq", class_obscure, &ports[0].irq, _("\
|
|
|
|
|
Set COM1 interrupt request."), _("\
|
|
|
|
|
Show COM1 interrupt request."), NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL, /* FIXME: i18n: */
|
|
|
|
|
&setlist, &showlist);
|
|
|
|
|
|
|
|
|
|
add_setshow_zinteger_cmd ("com2base", class_obscure, &ports[1].base, _("\
|
|
|
|
|
Set COM2 base i/o port address."), _("\
|
|
|
|
|
Show COM2 base i/o port address."), NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL, /* FIXME: i18n: */
|
|
|
|
|
&setlist, &showlist);
|
|
|
|
|
|
|
|
|
|
add_setshow_zinteger_cmd ("com2irq", class_obscure, &ports[1].irq, _("\
|
|
|
|
|
Set COM2 interrupt request."), _("\
|
|
|
|
|
Show COM2 interrupt request."), NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL, /* FIXME: i18n: */
|
|
|
|
|
&setlist, &showlist);
|
|
|
|
|
|
|
|
|
|
add_setshow_zinteger_cmd ("com3base", class_obscure, &ports[2].base, _("\
|
|
|
|
|
Set COM3 base i/o port address."), _("\
|
|
|
|
|
Show COM3 base i/o port address."), NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL, /* FIXME: i18n: */
|
|
|
|
|
&setlist, &showlist);
|
|
|
|
|
|
|
|
|
|
add_setshow_zinteger_cmd ("com3irq", class_obscure, &ports[2].irq, _("\
|
|
|
|
|
Set COM3 interrupt request."), _("\
|
|
|
|
|
Show COM3 interrupt request."), NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL, /* FIXME: i18n: */
|
|
|
|
|
&setlist, &showlist);
|
|
|
|
|
|
|
|
|
|
add_setshow_zinteger_cmd ("com4base", class_obscure, &ports[3].base, _("\
|
|
|
|
|
Set COM4 base i/o port address."), _("\
|
|
|
|
|
Show COM4 base i/o port address."), NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL, /* FIXME: i18n: */
|
|
|
|
|
&setlist, &showlist);
|
|
|
|
|
|
|
|
|
|
add_setshow_zinteger_cmd ("com4irq", class_obscure, &ports[3].irq, _("\
|
|
|
|
|
Set COM4 interrupt request."), _("\
|
|
|
|
|
Show COM4 interrupt request."), NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL, /* FIXME: i18n: */
|
|
|
|
|
&setlist, &showlist);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2017-08-22 22:09:55 +02:00
|
|
|
|
add_info ("serial", info_serial_command,
|
2005-02-15 Andrew Cagney <cagney@gnu.org>
Mark up add_com, add_info and add_prefix_cmd.
* breakpoint.c, cp-support.c, dcache.c, dwarf2read.c: Update.
* exec.c, f-valprint.c, frame.c, gcore.c, gnu-nat.c: Update.
* go32-nat.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* kod.c, language.c, linux-nat.c, m32r-rom.c, macrocmd.c: Update.
* maint.c, memattr.c, mips-tdep.c, nto-procfs.c, objc-lang.c: Update.
* ocd.c, pa64solib.c, printcmd.c, procfs.c, regcache.c: Update.
* remote-e7000.c, remote-m32r-sdi.c, remote-mips.c: Update.
* remote-sds.c, remote-sim.c, remote-st.c, remote-utils.c: Update.
* remote.c, rs6000-tdep.c, ser-go32.c, serial.c: Update.
* sh-tdep.c, solib.c, somsolib.c, source.c, stack.c: Update.
* symfile.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, typeprint.c, utils.c, valprint.c: Update.
* win32-nat.c, xcoffsolib.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-layout.c, tui/tui-regs.c: Update.
* tui/tui-stack.c, tui/tui-win.c: Update.
2005-02-15 16:49:28 +01:00
|
|
|
|
_("Print DOS serial port status."));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|