Differential D28725

ddb: just move cursor when the lexer backs up
ClosedPublic
Actions

Authored by rlibby on Feb 17 2021, 6:56 AM.

Details

Reviewers

markj

Commits

rGd8404b7ec36d: ddb: just move cursor when the lexer backs up

Summary

Get rid of db_look_char because it's not compatible with db_get_line().
This fixes the following issue:

db> script lockinfo=show alllocks
db> run lockinfo
db:0:lockinfo> how alllocks
No such command; use "help" to list available commands

Reported by: markj

Test Plan

db> script lockinfo=show alllocks
db> script lockinfo

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 37095
Build 33984: arc lint + arc unit

Event Timeline

rlibby created this revision.Feb 17 2021, 6:56 AM

Herald added a subscriber: imp. · View Herald TranscriptFeb 17 2021, 6:56 AM

rlibby requested review of this revision.Feb 17 2021, 6:56 AM

Harbormaster completed remote builds in B37086: Diff 84068.Feb 17 2021, 6:56 AM

Thank you!

sys/ddb/db_lex.c
113	Convert to an ANSI definition while here?

This revision is now accepted and ready to land.Feb 17 2021, 4:16 PM

markj feedback: ANSI-fy while here

This revision now requires review to proceed.Feb 17 2021, 4:28 PM

Harbormaster completed remote builds in B37095: Diff 84094.Feb 17 2021, 4:28 PM

markj accepted this revision.Feb 17 2021, 4:37 PM

This revision is now accepted and ready to land.Feb 17 2021, 4:37 PM

Closed by commit rGd8404b7ec36d: ddb: just move cursor when the lexer backs up (authored by rlibby). · Explain WhyFeb 25 2021, 12:00 AM

This revision was automatically updated to reflect the committed changes.

rlibby added a commit: rGd8404b7ec36d: ddb: just move cursor when the lexer backs up.

Revision Contents
Changeset List

Path

Size

sys/

ddb/

db_lex.c

27 lines

Diff 84094

View Options

sys/ddb/db_lex.c

	Show All 28 Lines
	LDRSRC= ${BOOTSRC}/common			LDRSRC= ${BOOTSRC}/common
	LIBLUASRC= ${BOOTSRC}/liblua			LIBLUASRC= ${BOOTSRC}/liblua
	LUASRC= ${SRCTOP}/contrib/lua/src			LUASRC= ${SRCTOP}/contrib/lua/src
	SASRC= ${BOOTSRC}/libsa			SASRC= ${BOOTSRC}/libsa
	SYSDIR= ${SRCTOP}/sys			SYSDIR= ${SRCTOP}/sys
	UBOOTSRC= ${BOOTSRC}/uboot			UBOOTSRC= ${BOOTSRC}/uboot
	ZFSSRC= ${SASRC}/zfs			ZFSSRC= ${SASRC}/zfs
	LIBCSRC= ${SRCTOP}/lib/libc			LIBCSRC= ${SRCTOP}/lib/libc
				WORLDTMP= ${OBJTOP}/tmp

	BOOTOBJ= ${OBJTOP}/stand			BOOTOBJ= ${OBJTOP}/stand

	# BINDIR is where we install			# BINDIR is where we install
	BINDIR?= /boot			BINDIR?= /boot

	# LUAPATH is where we search for and install lua scripts.			# LUAPATH is where we search for and install lua scripts.
	LUAPATH?= /boot/lua			LUAPATH?= /boot/lua
	▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Lines
	.endif			.endif

	# Machine specific flags for all builds here			# Machine specific flags for all builds here

	# All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc			# All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc
	# or powerpc64.			# or powerpc64.
	.if ${MACHINE_ARCH} == "powerpc64"			.if ${MACHINE_ARCH} == "powerpc64"
	CFLAGS+= -m32 -mcpu=powerpc			CFLAGS+= -m32 -mcpu=powerpc
				# Use same linker used to link 32 bit binaries
				.if "${COMPILER_TYPE}" == "clang" && "${LINKER_TYPE}" == "lld"
				bdragonUnsubmitted Done Inline Actions I'm seeing build failures at cleandir stage. I guess LINKER_TYPE isn't being defined at that point. So ${LINKER_TYPE} would need to be wrapped in quotes, or for LINKER_TYPE to be defined at all stages. bdragon: I'm seeing build failures at cleandir stage. I guess LINKER_TYPE isn't being defined at that…
				CFLAGS+= -fuse-ld=${LIB32LD}
				impUnsubmitted Done Inline Actions how does LIB32LD get defined? That's 100% opaque to me imp: how does LIB32LD get defined? That's 100% opaque to me
				alfredoAuthorUnsubmitted Done Inline Actions It's defined by in Makefile.libcompat.inc1 and passed to 'stand' by Makefile.inc1 through CROSSENV variable. alfredo: It's defined by in Makefile.libcompat.inc1 and passed to 'stand' by Makefile.inc1 through…
				impUnsubmitted Not Done Inline Actions This will fail when compiled stand alone outside of buildworld. imp: This will fail when compiled stand alone outside of buildworld.
				luporlUnsubmitted Done Inline Actions LIB32LD will be passed to stand either through buildworld or by first performing a 'make buildenv' before changing to stand and trying to build it. But when trying to build stand without calling buildenv first, LIB32LD will be undefined. In this case I chose to report an error, informing that LIB32LD must be set when stand is built with clang on powerpc64. Is that ok? If not, what would be the alternative? Put the LIB32LD detection code in a separate make file that could be included by stand/defs.mk? luporl: LIB32LD will be passed to stand either through buildworld or by first performing a 'make…
				impUnsubmitted Not Done Inline Actions No. I'd say that's not OK. It's almost never OK to have .error statements based on things not being defined. there's too many use cases to know you covered them all. imp: No. I'd say that's not OK. It's almost never OK to have .error statements based on things not…
				impUnsubmitted Done Inline Actions LIB32LD still isn't defined in a file that gets included in the build. Defining it all in bsd.compat.mk seems fundamentally wrong to me. that's not really what that's for. If you want to use those things in the rest of the build, you'd need to define it bsd.cpu.mk (which bsd.compat.mk has access to). imp: LIB32LD still isn't defined in a file that gets included in the build. Defining it all in bsd.
				.endif
	.endif			.endif

	# For amd64, there's a bit of mixed bag. Some of the tree (i386, lib*32) is			# For amd64, there's a bit of mixed bag. Some of the tree (i386, lib*32) is
	# build 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here			# build 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here
	# and activate it when DO32 is explicitly defined to be 1.			# and activate it when DO32 is explicitly defined to be 1.
	.if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1			.if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1
	CFLAGS+= -m32			CFLAGS+= -m32
	# LD_FLAGS is passed directly to ${LD}, not via ${CC}:			# LD_FLAGS is passed directly to ${LD}, not via ${CC}:
	▲ Show 20 Lines • Show All 128 Lines • Show Last 20 Lines

ddb: just move cursor when the lexer backs upClosedPublicActions