Mercurial > emacs
view nt/nmake.defs @ 107984:bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Basically, this makes the structure of buffer-local values and object
forwarding explicit in the type of Lisp_Symbols rather than use
special Lisp_Objects for that. This tends to lead to slightly more
verbose code, but is more C-like, simpler, and makes it easier to make
sure we handled all cases, among other things by letting the compiler
help us check it.
* lisp.h (enum Lisp_Misc_Type, union Lisp_Misc):
Removing forwarding objects.
(enum Lisp_Fwd_Type, enum symbol_redirect, union Lisp_Fwd): New types.
(struct Lisp_Symbol): Make the various forms of variable-forwarding
explicit rather than hiding them inside Lisp_Object "values".
(XFWDTYPE): New macro.
(XINTFWD, XBOOLFWD, XOBJFWD, XKBOARD_OBJFWD): Redefine.
(XBUFFER_LOCAL_VALUE): Remove.
(SYMBOL_VAL, SYMBOL_ALIAS, SYMBOL_BLV, SYMBOL_FWD, SET_SYMBOL_VAL)
(SET_SYMBOL_ALIAS, SET_SYMBOL_BLV, SET_SYMBOL_FWD): New macros.
(SYMBOL_VALUE, SET_SYMBOL_VALUE): Remove.
(struct Lisp_Intfwd, struct Lisp_Boolfwd, struct Lisp_Objfwd)
(struct Lisp_Buffer_Objfwd, struct Lisp_Kboard_Objfwd):
Remove the Lisp_Misc_* header.
(struct Lisp_Buffer_Local_Value): Redefine.
(BLV_FOUND, SET_BLV_FOUND, BLV_VALUE, SET_BLV_VALUE): New macros.
(struct Lisp_Misc_Any): Add filler to get the right size.
(struct Lisp_Free): Use struct Lisp_Misc_Any rather than struct
Lisp_Intfwd.
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_KBOARD): Allocate a forwarding object.
* data.c (do_blv_forwarding, store_blv_forwarding): New macros.
(let_shadows_global_binding_p): New function.
(union Lisp_Val_Fwd): New type.
(make_blv): New function.
(swap_in_symval_forwarding, indirect_variable, do_symval_forwarding)
(store_symval_forwarding, swap_in_global_binding, Fboundp)
(swap_in_symval_forwarding, find_symbol_value, Fset)
(let_shadows_buffer_binding_p, set_internal, default_value)
(Fset_default, Fmake_variable_buffer_local, Fmake_local_variable)
(Fkill_local_variable, Fmake_variable_frame_local)
(Flocal_variable_p, Flocal_variable_if_set_p)
(Fvariable_binding_locus):
* xdisp.c (select_frame_for_redisplay):
* lread.c (Fintern, Funintern, init_obarray, defvar_int)
(defvar_bool, defvar_lisp_nopro, defvar_lisp, defvar_kboard):
* frame.c (store_frame_param):
* eval.c (Fdefvaralias, Fuser_variable_p, specbind, unbind_to):
* bytecode.c (Fbyte_code) <varref, varset>: Adapt to the new symbol
value structure.
* buffer.c (PER_BUFFER_SYMBOL): Move from buffer.h.
(clone_per_buffer_values): Only adjust markers into the current buffer.
(reset_buffer_local_variables): PER_BUFFER_IDX is never -2.
(Fbuffer_local_value, set_buffer_internal_1)
(swap_out_buffer_local_variables):
Adapt to the new symbol value structure.
(DEFVAR_PER_BUFFER): Allocate a Lisp_Buffer_Objfwd object.
(defvar_per_buffer): Take a new arg for the fwd object.
(buffer_lisp_local_variables): Return a proper alist (different fix
for bug#4138).
* alloc.c (Fmake_symbol): Use SET_SYMBOL_VAL.
(Fgarbage_collect): Don't handle buffer_defaults specially.
(mark_object): Handle new symbol value structure rather than the old
special Lisp_Misc_* objects.
(gc_sweep) <symbols>: Free also the buffer-local-value objects.
* term.c (set_tty_color_mode):
* bidi.c (bidi_initialize): Don't access the ->value field directly.
* buffer.h (PER_BUFFER_VAR_OFFSET): Don't bother with
a buffer_local_flags.
* print.c (print_object): Get rid of impossible forwarding objects.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 19 Apr 2010 21:50:52 -0400 |
parents | 1d1d5d9bd884 |
children | a2184d0e089b 376148b31b5e |
line wrap: on
line source
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT. # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, # 2008, 2009, 2010 Free Software Foundation, Inc. # This file is part of GNU Emacs. # GNU Emacs 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 3 of the License, or # (at your option) any later version. # GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. # Ensure 'all' is the default target all: THE_SHELL = $(COMSPEC) SHELLTYPE=CMD MAKETYPE=nmake CURDIR = $(MAKEDIR:\=/) THISDIR = $(MAKEDIR) ALL_DEPS = $** SUBSYSTEM_WINDOWS=-subsystem:windows SUBSYSTEM_CONSOLE=-subsystem:console # INSTALL_DIR is the directory into which emacs will be installed. # !ifndef INSTALL_DIR INSTALL_DIR = $(CURDIR)/.. !endif # Ensure EMACSLOADPATH is defined in the environment. # !if [set EMACSLOADPATH=foo] !endif # Allow detection of builds with MSVC 5 or later, so we can # speed up compiles (see rule at end). # _NMAKE_VER_5=162 _NMAKE_VER_4=0 !IFNDEF _NMAKE_VER _NMAKE_VER=$(_NMAKE_VER_4) !ENDIF # Check that the INCLUDE and LIB environment variables are set. # !ifndef INCLUDE !error The INCLUDE environment variable needs to be set. !endif !ifndef LIB !error The LIB environment variable needs to be set. !endif # Determine the architecture we're running on. # Define ARCH for our purposes; # Define CPU for use by ntwin32.mak; # Define CONFIG_H to the appropriate config.h for the system; # !ifdef PROCESSOR_ARCHITECTURE # We're on Windows NT CPU = $(PROCESSOR_ARCHITECTURE) CONFIG_H = config.nt OS_TYPE = windowsnt ! if "$(PROCESSOR_ARCHITECTURE)" == "x86" ARCH = i386 CPU = i386 ! else ! if "$(PROCESSOR_ARCHITECTURE)" == "MIPS" ARCH = mips ! else ! if "$(PROCESSOR_ARCHITECTURE)" == "ALPHA" ARCH = alpha ! else ! if "$(PROCESSOR_ARCHITECTURE)" == "PPC" ARCH = ppc ! else ! error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)" ! endif ! endif ! endif ! endif !else # We're on Windows 95 ARCH = i386 CPU = i386 CONFIG_H = config.nt OS_TYPE = windows95 !endif AR = lib AR_OUT = -out: CC = cl CC_OUT = -Fo LINK = link LINK_OUT = -out: RC = rc RC_OUT = -Fo RC_INCLUDE = -i libc = libc.lib baselibs = O = obj A = lib BASE_LIBS = $(libc) $(baselibs) oldnames.lib ADVAPI32 = advapi32.lib COMCTL32 = comctl32.lib COMDLG32 = comdlg32.lib GDI32 = gdi32.lib MPR = mpr.lib SHELL32 = shell32.lib USER32 = user32.lib WSOCK32 = wsock32.lib WINMM = winmm.lib WINSPOOL = winspool.lib OLE32 = ole32.lib UNISCRIBE = usp10.lib UUID = uuid.lib !ifdef NOOPT DEBUG_CFLAGS = -DEMACSDEBUG !else DEBUG_CFLAGS = !endif CFLAGS = -I. $(ARCH_CFLAGS) \ $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) EMACS_EXTRA_C_FLAGS = SYS_LDFLAGS = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj # see comments in allocate_heap in w32heap.c before changing any of the # -stack, -heap, or -base settings. TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK) !ifdef NOOPT OBJDIR = obj !else OBJDIR = obj-spd !endif $(OBJDIR):; -mkdir $(OBJDIR) BLD = $(OBJDIR)/$(ARCH) stamp_BLD: $(OBJDIR) -mkdir "$(BLD)" echo $(BLD) > $@ COMPILER_TEMP_FILES = *.pdb CP = cp -f CP_DIR = cp -rf IFNOTSAMEDIR = if not exist ..\same-dir.tst ENDIF = FOREACH = for %%f in ( FORVAR = %%f FORDO = ) do ENDFOR = ARGQUOTE = " # " DQUOTE = \" DEL = rm DEL_TREE = rm -r !ifdef NODEBUG DEBUG_FLAG = DEBUG_LINK = !else DEBUG_FLAG = -Zi DEBUG_LINK = -debug:full !endif !if "$(ARCH)" == "i386" !ifdef NOOPT ARCH_CFLAGS = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG) !else ARCH_CFLAGS = -nologo -c -Zel -W2 -H63 -Oxsb2 -Oy- -G6dF -Zp8 $(DEBUG_FLAG) !endif ARCH_LDFLAGS = $(SYS_LDFLAGS) !else !if "$(ARCH)" == "mips" ARCH_CFLAGS = -D_MIPS_=1 -c -W2 -Zi -Od -Gt0 ARCH_LDFLAGS = $(SYS_LDFLAGS) !else !if "$(ARCH)" == "alpha" !if "$(BUILD_TYPE)" == "spd" ARCH_CFLAGS = -D_ALPHA_=1 -c -Ze -Zi -W2 -Od -D__stdcall= -D__cdecl= !else ARCH_CFLAGS = -D_ALPHA_=1 -c -Ze -Zi -W2 -O1 -D__stdcall= -D__cdecl= !endif ARCH_LDFLAGS = $(SYS_LDFLAGS) !else !if "$(ARCH)" == "ppc" # These flags are a guess...if they don't work, please send me mail. ARCH_CFLAGS = -D_PPC_=1 -c -Ze -Zi -W2 -Od ARCH_LDFLAGS = $(SYS_LDFLAGS) !else !ERROR Unknown architecture type "$(ARCH)". !endif !endif !endif !endif LINK_FLAGS = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(USER_LDFLAGS) # From MSVC 5.0 onwards, it seem base relocation information is not included, # at least in release builds. We need to ensure the reloc info is included # in order to use the MSVC profiler. !IF ("$(_NMAKE_VER)" == "$(_NMAKE_VER_4)") EXTRA_LINK = !ELSE EXTRA_LINK = -profile !ENDIF # # If the compiler supports compiling multiple .c files to .o files at # one time, use this feature. # !IF ("$(_NMAKE_VER)" == "$(_NMAKE_VER_4)") .c{$(BLD)}.obj: $(CC) $(CFLAGS) -Fo$(BLD)\ $< !ELSE .c{$(BLD)}.obj:: $(CC) $(CFLAGS) -Fo$(BLD)\ $< !ENDIF # arch-tag: fefa49b0-c23c-46c7-9094-cab2a405058e