pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/51103: Updates for ski emulator
The following reply was made to PR pkg/51103; it has been noted by GNATS.
From: scole_mail <scole_mail%gmx.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/51103: Updates for ski emulator
Date: Fri, 29 Apr 2016 09:22:52 -0400
Here are the new files:
options.mk ==========================================
# $NetBSD$
PKG_OPTIONS_VAR= PKG_OPTIONS.ski
PKG_SUPPORTED_OPTIONS= debug gtk motif
PKG_SUGGESTED_OPTIONS= gtk motif
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
CPPFLAGS+= -g
INSTALL_UNSTRIPPED= yes
.endif
PLIST_VARS+= xski
.if !empty(PKG_OPTIONS:Mmotif)
PLIST.xski= yes
CONFIGURE_ARGS+= --with-x11
INSTALLATION_DIRS+= lib/X11/app-defaults
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../x11/motif/buildlink3.mk"
.endif
PLIST_VARS+= gski
.if !empty(PKG_OPTIONS:Mgtk)
PLIST.gski= yes
CONFIGURE_ARGS+= --with-gtk
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.endif
patches/patch-XSki.netbsd ==========================================
$NetBSD$
Include X resource file for NetBSD which is a copy of the FreeBSD one.
--- XSki.netbsd.orig 2016-04-19 12:56:13.000000000 -0400
+++ XSki.netbsd 2016-04-19 12:56:25.000000000 -0400
@@ -0,0 +1,476 @@
+!
+! Copyright (C) 1995-2007, Hewlett-Packard Development Company, L.P.
+!
+! 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
+! the Free Software Foundation; either version 2 of the License, or
+! (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 along
+! with this program; if not, write to the Free Software Foundation, Inc.,
+! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+!
+
+! *XmText.fontList: <font>
+
+*background: rgb:C0/C0/C0
+main.geometry: +0+0
+
+*showUrs: True
+*showGrs: True
+*showFrs: True
+*showSrs: True
+*showIArs: True
+
+*regwUrs.rows: 7
+*regwGrs.rows: 7
+*regwFrs.rows: 4
+*regwSrs.rows: 2
+*regwIArs.rows: 4
+
+*viewProgram: True
+*viewData: True
+*viewvga: False
+*viewRegisters: True
+
+*help.sensitive: False
+*bb4.sensitive: False
+*bb5.sensitive: False
+*prgwRC.goto.sensitive: False
+*datwRC.goto.sensitive: False
+
+*File.mnemonic: F
+*View.mnemonic: V
+*Configure.mnemonic: C
+*Help.mnemonic: H
+
+*load.labelString: Open...
+*load.mnemonic: O
+*save.labelString: Save...
+*save.mnemonic: S
+*trace.labelString: Trace...
+*trace.mnemonic: T
+*traceOn.labelString: Enable Trace
+*traceOff.labelString: Disable Trace
+*read.labelString: Read...
+*read.mnemonic: R
+*quit.labelString: Quit
+*quit.mnemonic: Q
+
+*LoadFSD.fileTypeMask: FILE_REGULAR
+*LoadFSD.textColumns: 50
+*load_syms.labelString: Load all symbols
+*load_syms.alignment: ALIGNMENT_BEGINNING
+
+*program.labelString: Program
+*program.mnemonic: P
+*data.labelString: Data
+*data.mnemonic: D
+*registers.labelString: Registers
+*registers.mnemonic: R
+*cache.labelString: Cache
+*cache.mnemonic: C
+*tlb.labelString: TLB
+*tlb.mnemonic: T
+*callstack.labelString: Call Stack
+*breakpoints.labelString: Breakpoints
+*breakpoints.mnemonic: B
+*symbols.labelString: Symbols
+*symbols.mnemonic: S
+
+*context.labelString: Context-Sensitive Help
+*context.mnemonic: C
+*overview.labelString: Overview
+*overview.mnemonic: O
+*commands.labelString: Commands
+*product.labelString: Product Information
+*product.mnemonic: P
+
+*loadFSD_popup.title: Open File
+*prodInfo_popup.title: Help -- Product Information
+
+! Processor Selection
+*p0.labelString: 0
+*p1.labelString: 1
+*p2.labelString: 2
+*procOption.labelString: Processor
+
+! Button Box
+*bbox.orientation: HORIZONTAL
+*bbox.packing: PACK_TIGHT
+*bb0.labelString: Step
+*bb0.translations: Shift<Btn1Down>: SimCmd("step 10")\n\
+ <Btn1Down>: SimCmd("step 1")
+*bb1.labelString: Run
+*bb1.translations: <Btn1Down>: SimCmd("run")
+*bb2.labelString: Prog
+*bb2.translations: <Btn1Down>: SimCmd("pj")
+*bb3.labelString: Data
+*bb3.translations: <Btn1Down>: SimCmd("dj")
+*bb4.labelString: Regs
+*bb5.labelString: Cache
+*bb6.labelString: TLB
+*bb6.translations: <Btn1Down>: SimCmd("sdt")
+*bb7.labelString: Quit
+*bb7.translations: <Btn1Down>: SimCmd("quit")
+
+*cmd.promptString: Command:
+*cmd.historyVisibleItemCount: 5
+*cmd.textColumns: 45
+
+*msgs.editMode: MULTI_LINE_EDIT
+*msgs.editable: False
+*msgs.cursorPositionVisible: False
+*msgs.rows: 10
+
+! Generic Pushbutton resources
+*ok.labelString: OK
+*apply.labelString: Apply
+*cancel.labelString: Cancel
+*close.labelString: Close
+*config.labelString: Configure
+*goto.labelString: Goto
+*help.labelString: Help
+
+*real.labelString: Real
+*virtual.labelString: Virtual
+
+! Program Window
+! These 3 are not currently used
+*prgw.cancelLabelString: Cancel
+*prgw.helpLabelString: Help
+*prgw.okLabelString: OK
+
+*prgw_popup.title: Program Window
+*prgw_popup.geometry: 550-0+0
+*prgw.defaultPosition: False
+
+*prgwH.alignment: ALIGNMENT_BEGINNING
+*prgwH.leftAttachment: ATTACH_FORM
+*prgwH.rightAttachment: ATTACH_FORM
+*prgwH.topAttachment: ATTACH_FORM
+
+*prgwT.rows: 21
+*prgwT.editMode: MULTI_LINE_EDIT
+*prgwT.editable: False
+*prgwT.autoShowCursorPosition: False
+*prgwT.cursorPositionVisible: False
+*prgwT.resizeHeight: False
+*prgwT.resizeWidth: False
+! *prgwT.resizeWidth: True
+*prgwT.leftAttachment: ATTACH_FORM
+*prgwT.rightAttachment: ATTACH_FORM
+*prgwT.topAttachment: ATTACH_WIDGET
+*prgwT.topWidget: prgwH
+*prgwT.bottomAttachment: ATTACH_WIDGET
+*prgwT.bottomWidget: prgwS
+*prgwT.translations: #override\n\
+ <ConfigureNotify>: pwResize()\n\
+ <Key>osfPageDown: SimCmd(pf)\n\
+ <Key>osfPageUp: SimCmd(pb)\n\
+ <Key>osfDown: SimCmd("pf 1")\n\
+ <Key>osfUp: SimCmd("pb 1")
+
+*prgwS.leftAttachment: ATTACH_FORM
+*prgwS.rightAttachment: ATTACH_FORM
+*prgwS.bottomAttachment: ATTACH_WIDGET
+*prgwS.bottomWidget: prgwRC
+
+*prgwRC.adjustLast: False
+*prgwRC.orientation: HORIZONTAL
+*prgwRC.spacing: 10
+*prgwRC.leftAttachment: ATTACH_FORM
+*prgwRC.rightAttachment: ATTACH_FORM
+*prgwRC.bottomAttachment: ATTACH_FORM
+
+! Program Window Configure Dialog
+*pwConf_popup.title: Program Window Configuration
+
+*pwConfRC.adjustLast: False
+*pwConfRC.orientation: HORIZONTAL
+*pwConfRC.spacing: 10
+*pwConfRC.leftAttachment: ATTACH_FORM
+*pwConfRC.rightAttachment: ATTACH_FORM
+*pwConfRC.bottomAttachment: ATTACH_FORM
+
+*pwConfS.leftAttachment: ATTACH_FORM
+*pwConfS.rightAttachment: ATTACH_FORM
+*pwConfS.bottomAttachment: ATTACH_WIDGET
+*pwConfS.bottomWidget: pwConfRC
+
+*iofs.labelString: Instruction Offset Format:
+*iofs.rightAttachment: ATTACH_WIDGET
+*iofs.rightWidget: iofsrb
+*iofs.topAttachment: ATTACH_OPPOSITE_WIDGET
+*iofs.topWidget: iofsrb
+*iofs.bottomAttachment: ATTACH_OPPOSITE_WIDGET
+*iofs.bottomWidget: iofsrb
+
+*iofsrb.orientation: HORIZONTAL
+*iofsrb.bottomAttachment: ATTACH_WIDGET
+*iofsrb.bottomWidget: instrb
+*iofsrb.bottomOffset: 2
+*iofsrb.rightAttachment: ATTACH_FORM
+
+*iofshex.labelString: Hexadecimal
+
+*iofssym.labelString: Symbolic
+
+*iofsboth.labelString: Both
+
+*inst.labelString: Instruction Format:
+*inst.rightAttachment: ATTACH_WIDGET
+*inst.rightWidget: instrb
+*inst.topAttachment: ATTACH_OPPOSITE_WIDGET
+*inst.topWidget: instrb
+*inst.bottomAttachment: ATTACH_OPPOSITE_WIDGET
+*inst.bottomWidget: instrb
+
+*instrb.orientation: HORIZONTAL
+*instrb.bottomAttachment: ATTACH_WIDGET
+*instrb.bottomWidget: pwConfS
+*instrb.bottomOffset: 2
+*instrb.rightAttachment: ATTACH_FORM
+
+*insthex.labelString: Hexadecimal
+
+*instsym.labelString: Disassembled
+
+*instboth.labelString: Both
+
+! Program Window Goto Dialog
+*pwGoto_popup.title: Program Window Goto
+
+*pwGotoRC.adjustLast: False
+*pwGotoRC.orientation: HORIZONTAL
+*pwGotoRC.spacing: 10
+*pwGotoRC.leftAttachment: ATTACH_FORM
+*pwGotoRC.rightAttachment: ATTACH_FORM
+*pwGotoRC.bottomAttachment: ATTACH_FORM
+
+*pwGotoS.leftAttachment: ATTACH_FORM
+*pwGotoS.rightAttachment: ATTACH_FORM
+*pwGotoS.bottomAttachment: ATTACH_WIDGET
+*pwGotoS.bottomWidget: pwGotoRC
+
+*pwOffset.rightAttachment: ATTACH_FORM
+*pwOffset.bottomAttachment: ATTACH_WIDGET
+*pwOffset.bottomWidget: pwGotoS
+
+*pwOffsetL.labelString: Offset:
+*pwOffsetL.rightAttachment: ATTACH_WIDGET
+*pwOffsetL.rightWidget: pwOffset
+*pwOffsetL.topAttachment: ATTACH_OPPOSITE_WIDGET
+*pwOffsetL.topWidget: pwOffset
+*pwOffsetL.bottomAttachment: ATTACH_OPPOSITE_WIDGET
+*pwOffsetL.bottomWidget: pwOffset
+
+*pwSpace.rightAttachment: ATTACH_FORM
+*pwSpace.bottomAttachment: ATTACH_WIDGET
+*pwSpace.bottomWidget: pwOffset
+
+*pwSpaceL.labelString: Space:
+*pwSpaceL.rightAttachment: ATTACH_WIDGET
+*pwSpaceL.rightWidget: pwSpace
+*pwSpaceL.topAttachment: ATTACH_OPPOSITE_WIDGET
+*pwSpaceL.topWidget: pwSpace
+*pwSpaceL.bottomAttachment: ATTACH_OPPOSITE_WIDGET
+*pwSpaceL.bottomWidget: pwSpace
+
+*pwAddr.orientation: HORIZONTAL
+*pwAddr.leftAttachment: ATTACH_FORM
+*pwAddr.topAttachment: ATTACH_FORM
+*pwAddr.bottomAttachment: ATTACH_WIDGET
+*pwAddr.bottomWidget: pwSpace
+
+! Data Window
+*datw_popup.title: Data Window
+*datw_popup.geometry: x225+0-0
+*datw.defaultPosition: False
+
+*datwH.alignment: ALIGNMENT_BEGINNING
+*datwH.leftAttachment: ATTACH_FORM
+*datwH.rightAttachment: ATTACH_FORM
+*datwH.topAttachment: ATTACH_FORM
+
+*datwT.rows: 12
+*datwT.editMode: MULTI_LINE_EDIT
+*datwT.editable: False
+*datwT.autoShowCursorPosition: False
+*datwT.cursorPositionVisible: False
+*datwT.resizeWidth: True
+*datwT.leftAttachment: ATTACH_FORM
+*datwT.rightAttachment: ATTACH_FORM
+*datwT.topAttachment: ATTACH_WIDGET
+*datwT.topWidget: datwH
+*datwT.bottomAttachment: ATTACH_WIDGET
+*datwT.bottomWidget: datwS
+*datwT.translations: #override \n\
+ <ConfigureNotify>: dwResize()\n\
+ <Key>osfPageDown: SimCmd(df)\n\
+ <Key>osfPageUp: SimCmd(db)\n\
+ <Key>osfDown: SimCmd("df 1")\n\
+ <Key>osfUp: SimCmd("db 1")
+
+*datwS.leftAttachment: ATTACH_FORM
+*datwS.rightAttachment: ATTACH_FORM
+*datwS.bottomAttachment: ATTACH_WIDGET
+*datwS.bottomWidget: datwRC
+
+*datwRC.adjustLast: False
+*datwRC.orientation: HORIZONTAL
+*datwRC.spacing: 10
+*datwRC.leftAttachment: ATTACH_FORM
+*datwRC.rightAttachment: ATTACH_FORM
+*datwRC.bottomAttachment: ATTACH_FORM
+
+! VGA Window
+*vga_popup.title: VGA Window
+*vga_popup.geometry: 640x480+0-0
+*vga.defaultPosition: False
+
+*vgaH.alignment: ALIGNMENT_BEGINNING
+*vgaH.leftAttachment: ATTACH_FORM
+*vgaH.rightAttachment: ATTACH_FORM
+*vgaH.topAttachment: ATTACH_FORM
+
+*vgaT.rows: 24
+*vgaT.editMode: MULTI_LINE_EDIT
+*vgaT.editable: False
+*vgaT.autoShowCursorPosition: False
+*vgaT.cursorPositionVisible: False
+*vgaT.resizeWidth: True
+*vgaT.leftAttachment: ATTACH_FORM
+*vgaT.rightAttachment: ATTACH_FORM
+*vgaT.topAttachment: ATTACH_WIDGET
+*vgaT.topWidget: vgaH
+*vgaT.bottomAttachment: ATTACH_WIDGET
+*vgaT.bottomWidget: vgaS
+*vgaT.translations: #override\n\
+ <ConfigureNotify>: dwResize()\n\
+ <Key>osfPageDown: SimCmd(vf)\n\
+ <Key>osfPageUp: SimCmd(vb)\n\
+ <Key>osfDown: SimCmd("vf 1")\n\
+ <Key>osfUp: SimCmd("vb 1")
+
+*vgaS.leftAttachment: ATTACH_FORM
+*vgaS.rightAttachment: ATTACH_FORM
+*vgaS.bottomAttachment: ATTACH_WIDGET
+*vgaS.bottomWidget: vgaRC
+
+*vgaRC.adjustLast: False
+*vgaRC.orientation: HORIZONTAL
+*vgaRC.spacing: 10
+*vgaRC.leftAttachment: ATTACH_FORM
+*vgaRC.rightAttachment: ATTACH_FORM
+*vgaRC.bottomAttachment: ATTACH_FORM
+*vgaRC.goto.sensitive: False
+
+! Registers Window
+*regw_popup.title: Registers Window
+*regw.noResize: False
+*regw_popup.geometry: 520x475-0-0
+*regw.defaultPosition: False
+
+!*regwP.marginHeight: 5
+!*regwP.marginWidth: 10
+!*regwP.refigureMode: False
+!*regwP.sashHeight: 20
+!*regwP.sashWidth: 15
+!*regwP.sashIdent: -20
+!*regwP.separatorOn: False
+!*regwP.spacing: 2
+!*regwP.shadowThickness: 5
+
+*regwP.leftAttachment: ATTACH_FORM
+*regwP.rightAttachment: ATTACH_FORM
+*regwP.topAttachment: ATTACH_FORM
+*regwP.bottomAttachment: ATTACH_WIDGET
+*regwP.bottomWidget: regwS
+
+*regwS.leftAttachment: ATTACH_FORM
+*regwS.rightAttachment: ATTACH_FORM
+*regwS.bottomAttachment: ATTACH_WIDGET
+*regwS.bottomWidget: regwRC
+
+*regwRC.adjustLast: False
+*regwRC.orientation: HORIZONTAL
+*regwRC.spacing: 10
+*regwRC.leftAttachment: ATTACH_FORM
+*regwRC.rightAttachment: ATTACH_FORM
+*regwRC.bottomAttachment: ATTACH_FORM
+
+! Registers Window Configure Dialog
+*rwConf_popup.title: Registers Window Configuration
+
+*rwConfRC.adjustLast: False
+*rwConfRC.orientation: HORIZONTAL
+*rwConfRC.spacing: 10
+*rwConfRC.leftAttachment: ATTACH_FORM
+*rwConfRC.rightAttachment: ATTACH_FORM
+*rwConfRC.bottomAttachment: ATTACH_FORM
+
+*rwConfS.leftAttachment: ATTACH_FORM
+*rwConfS.rightAttachment: ATTACH_FORM
+*rwConfS.bottomAttachment: ATTACH_WIDGET
+*rwConfS.bottomWidget: rwConfRC
+
+*rwConfT.orientation: HORIZONTAL
+*rwConfT.numColumns: 2
+*rwConfT.packing: PACK_COLUMN
+*rwConfT.leftAttachment: ATTACH_FORM
+*rwConfT.rightAttachment: ATTACH_FORM
+*rwConfT.bottomAttachment: ATTACH_WIDGET
+*rwConfT.bottomWidget: rwConfS
+
+*rwConfT.urs.labelString: URs
+*rwConfT.grs.labelString: GRs
+*rwConfT.frs.labelString: FRs
+*rwConfT.srs.labelString: SRs
+
+! Symlist Window
+*symlist_popup.title: Symbols
+*symlist_popup.geometry: +300+100
+
+! Cmdhelp Window
+*cmdhelp_popup.title: Commands
+*cmdhelp_popup.geometry: +400+150
+
+! Callstack Window
+*callstack_popup.title: Call Stack
+*callstack_popup.geometry: +500+200
+
+! Breakpoint Window
+*breakpoints_popup.title: Breakpoints
+*breakpoints_popup.geometry: +600+250
+
+! Register Dump Window
+*regdump_popup.title: Register Dump
+*regdump_popup.geometry: +700+300
+
+! Program Dump Window
+*progdump_popup.title: Program Dump
+*progdump_popup.geometry: +800+350
+
+! Data Dump Window
+*datadump_popup.title: Data Dump
+*datadump_popup.geometry: +900+400
+
+! Instruction TLB Dump Window
+*itlblist_popup.title: Instruction TLB
+
+! Data TLB Dump Window
+*dtlblist_popup.title: Data TLB
+
+! See man-page for VirtualBindings(3) (included in OpenMotif):
+*defaultVirtualBindings: \
+ osfBackSpace: <Key>BackSpace\n\
+ osfPageDown: <Key>Next\n\
+ osfPageUp: <Key>Prior\n\
+ osfDown: <Key>Down\n\
+ osfUp: <Key>Up\n
patches/patch-src-line_separator.h ==========================================
$NetBSD$
Do not use carriage returns on unix which messes up ncurses display of code.
--- src/line_separator.h.orig 2016-04-17 06:52:45.000000000 -0400
+++ src/line_separator.h 2016-04-17 06:27:01.000000000 -0400
@@ -0,0 +1,6 @@
+/* XXX */
+#if defined(__CYGWIN__) || defined(_WIN32)
+#define LINE_SEPARATOR "\r\n"
+#else
+#define LINE_SEPARATOR "\n"
+#endif
patches/patch-src_eparse.y ==========================================
$NetBSD$
Rename strtonum to strtonumber so will not get errors about duplicate functions.
--- src/eparse.y.orig 2008-02-04 23:11:38.000000000 -0500
+++ src/eparse.y 2016-04-17 13:31:45.000000000 -0400
@@ -34,7 +34,7 @@
extern int yylex (void );
static REG convert(char);
static REG rd8(REG);
-static REG strtonum(char *, int);
+static REG strtonumber(char *, int);
static void yyerror(char *);
%}
@@ -164,18 +164,18 @@
;
count : based
- | NOBASE { $$ = strtonum($1, 10); }
+ | NOBASE { $$ = strtonumber($1, 10); }
;
number : based
- | NOBASE { $$ = strtonum($1, 16); }
- | NPFXHEX { $$ = strtonum($1, 16); }
+ | NOBASE { $$ = strtonumber($1, 16); }
+ | NPFXHEX { $$ = strtonumber($1, 16); }
;
-based : BIN { $$ = strtonum($1, 2); }
- | OCT { $$ = strtonum($1, 8); }
- | DEC { $$ = strtonum($1, 10); }
- | HEX { $$ = strtonum($1, 16); }
+based : BIN { $$ = strtonumber($1, 2); }
+ | OCT { $$ = strtonumber($1, 8); }
+ | DEC { $$ = strtonumber($1, 10); }
+ | HEX { $$ = strtonumber($1, 16); }
;
%%
@@ -197,7 +197,7 @@
return memMRd(0, addr, 8, &dval) ? dval : 0;
}
-static REG strtonum(char *str, int base)
+static REG strtonumber(char *str, int base)
{
REG num = 0;
patches/patch-src_freebsd_signal.h ==========================================
$NetBSD$
Make FreeBSD version compile
--- src/freebsd/signal.h.orig 2008-02-04 23:11:38.000000000 -0500
+++ src/freebsd/signal.h 2016-04-17 13:25:40.000000000 -0400
@@ -42,8 +42,35 @@
int sigval_int;
ptr64 sigval_ptr;
} si_value;
+
+ /* XXX copied from /usr/include/sys/signal.h since si_band
+ * is already #define'd there
+ */
+#if 0
long si_band;
int __spare__[7];
+#else
+ union {
+ struct {
+ int _trapno;/* machine specific trap code */
+ } _fault;
+ struct {
+ int _timerid;
+ int _overrun;
+ } _timer;
+ struct {
+ int _mqd;
+ } _mesgq;
+ struct {
+ long _band; /* band event for SIGPOLL */
+ } _poll; /* was this ever used ? */
+ struct {
+ long __spare1__;
+ int __spare2__[7];
+ } __spare__;
+ } _reason;
+#endif
+
};
int signal_get_handler(int, struct sigaction64 *);
patches/patch-src_program.c ==========================================
$NetBSD$
Use correct line separators.
--- src/program.c.orig 2008-02-04 23:11:38.000000000 -0500
+++ src/program.c 2016-04-17 06:24:07.000000000 -0400
@@ -43,6 +43,7 @@
#include "ia_exec.h"
#include "state.h"
#include "simmem.h"
+#include "line_separator.h"
static char instPtr(ADDR addr, char *dline);
static IAinstInfoPtr addrToIAinfo(ADDR adr, BYTE iAmode, unsigned *nbytes);
@@ -268,11 +269,11 @@
dasInit(DasPseudoOps|DasTemplate|DasRegNames, prgColumns - 20);
dasBundle(&bndl, i0Str, i1Str, i2Str);
ipp = instPtr(ofs, i0Str);
- p += sprintf(p, "%s%c%c %s %s\r\n", srcp, bpn, ipp, buf, i0Str);
+ p += sprintf(p, "%s%c%c %s %s%s", srcp, bpn, ipp, buf, i0Str, LINE_SEPARATOR);
if (i1Str[0]) { /* not MLX */
bpn = ((i = isbpt(ofs + 4)) >= 0) ? (i + '0') : ' ';
ipp = instPtr(ofs + 4, i1Str);
- p += sprintf(p, "%c%c %16s %s\r\n", bpn, ipp, "", i1Str);
+ p += sprintf(p, "%c%c %16s %s%s", bpn, ipp, "", i1Str, LINE_SEPARATOR);
bpn = ((i = isbpt(ofs + 8)) >= 0) ? (i + '0') : ' ';
ipp = instPtr(ofs + 8, i2Str);
} else { /* MLX */
@@ -280,12 +281,12 @@
? (i + '0') : ' ';
ipp = instPtr(ofs + 4, i2Str);
}
- p += sprintf(p, "%c%c %16s %s\r\n", bpn, ipp, "", i2Str);
+ p += sprintf(p, "%c%c %16s %s%s", bpn, ipp, "", i2Str, LINE_SEPARATOR);
*asmrows = i1Str[0] ? 3 : 2;
} else {
xxx:
ipp = (ipGet(viewPid) == ofs) ? '>' : ' ';
- (void)sprintf(line, "%c%c %s xxxxxxxx\r\n", bpn, ipp, buf);
+ (void)sprintf(line, "%c%c %s xxxxxxxx%s", bpn, ipp, buf, LINE_SEPARATOR);
*srcrows = 0;
*asmrows = 1;
}
patches/patch-src_ssDCmd.c ==========================================
$NetBSD$
Use correct line separators.
--- src/ssDCmd.c.orig 2008-02-04 23:11:38.000000000 -0500
+++ src/ssDCmd.c 2016-04-17 06:26:02.000000000 -0400
@@ -42,6 +42,7 @@
#include "libcore.h"
#include "dos.h"
#include "libtrace.h"
+#include "line_separator.h"
#define MAXFILEDEPTH 16
#define MAXCMDLEN 4000
@@ -630,7 +631,7 @@
p = strtok(NULL, " \t");
ofs = p ? (ADDR)strtoul(p, 0, 16) : 0;
adr = (seg << 4) + ofs + start + symOffset;
- if ((p = strtok(NULL, " \t\r\n")))
+ if ((p = strtok(NULL, " \t"LINE_SEPARATOR)))
symInsert(p, adr, 0);
}
(void)fclose(fp);
@@ -733,7 +734,7 @@
p = strtok(NULL, " \t");
ofs = p ? (ADDR)strtoul(p, 0, 16) : 0;
adr = (seg << 4) + ofs + start;
- if ((p = strtok(NULL, " \t\r\n")))
+ if ((p = strtok(NULL, " \t"LINE_SEPARATOR)))
symInsert(p, adr, 0);
}
(void)fclose(fp);
patches/patch-src_ssX.c ==========================================
$NetBSD$
Find default X resource file.
--- src/ssX.c.orig 2008-02-04 23:11:37.000000000 -0500
+++ src/ssX.c 2016-04-28 09:45:23.000000000 -0400
@@ -49,6 +49,7 @@
#include "coreui.h"
#include "ssDCmd.h"
#include "libcore.h"
+#include "line_separator.h"
#if 0
/* Include files not needed for now in the simulator */
@@ -174,6 +175,24 @@
Arg args[10];
unsigned i, n;
int argc = 0;
+ const char* xenv = "XENVIRONMENT";
+ const char* genv = getenv(xenv);
+ const char* xski_rc = "XSKI_RESOURCE_FILE";
+
+ /*
+ * XXX how to add pkgsrc paths to X app-default search path? For
+ * simplicity, just set environment variable or give warning if
+ * already set. If XSki app-defaults not found, xski will display
+ * jumbled gui but doesn't look like it can run.
+ */
+ if (genv && (strcmp(genv, xski_rc) != 0)) {
+ printf("WARNING: If GUI not displayed correctly, try setting "
+ "environment variable \"%s\" to \"%s\"%s",
+ xenv, xski_rc, LINE_SEPARATOR);
+ }
+ else {
+ setenv(xenv, xski_rc, 0);
+ }
addRegwRsrcOpts();
addDatwRsrcOpts();
Home |
Main Index |
Thread Index |
Old Index