@@ -411,19 +411,6 @@ endif ifdef CROSS_COMPILE # jscpucfg needs to know when it's supposed to produce a config for the target JSCPUCFG_DEFINES = $(ACDEFINES) - -# This is incredibly hacky. Darwin NSPR uses the same MDCPUCFG for multiple -# processors, and determines which processor to configure for based on -# #ifdef i386. This macro is among the NSPR defines, but is also automatically -# defined by the compiler when building for i386. It therefore needs to be -# defined here if targeting i386, and explicitly undefined otherwise. -ifeq ($(OS_ARCH),Darwin) -ifeq ($(TARGET_CPU),powerpc) -JSCPUCFG_DEFINES += -Ui386 -else -JSCPUCFG_DEFINES += -Di386=1 -endif -endif endif ifeq ($(OS_ARCH),QNX) vendor/spidermonkey/Makefile.in @@ -174,6 +174,7 @@ JS_HFILES = \ jsscope.h \ jsscript.h \ jsstr.h \ + jsutil.h \ jsxdrapi.h \ jsxml.h \ $(NULL) vendor/spidermonkey/Makefile.ref @@ -94,9 +94,6 @@ endif ifeq ($(OS_ARCH),Linux) OS_CONFIG := Linux_All else -ifeq ($(OS_ARCH),FreeBSD) -OS_CONFIG := FreeBSD -else ifeq ($(OS_ARCH),dgux) OS_CONFIG := dgux else @@ -107,7 +104,6 @@ OS_CONFIG := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE) endif endif endif -endif ASFLAGS = DEFINES = vendor/spidermonkey/config.mk @@ -1,1453 +1,1453 @@ -# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -!IF "$(CFG)" == "" -CFG=fdlibm - Win32 Debug -!MESSAGE No configuration specified. Defaulting to fdlibm - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "fdlibm - Win32 Release" && "$(CFG)" != "fdlibm - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE on this makefile -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "fdlibm.mak" CFG="fdlibm - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fdlibm - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "fdlibm - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF -################################################################################ -# Begin Project -CPP=cl.exe - -!IF "$(CFG)" == "fdlibm - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "fdlibm__" -# PROP BASE Intermediate_Dir "fdlibm__" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "fdlibm__" -# PROP Intermediate_Dir "fdlibm__" -# PROP Target_Dir "" -OUTDIR=.\fdlibm__ -INTDIR=.\fdlibm__ - -ALL : "$(OUTDIR)\fdlibm.lib" - -CLEAN : - -@erase "$(INTDIR)\e_acos.obj" - -@erase "$(INTDIR)\e_acosh.obj" - -@erase "$(INTDIR)\e_asin.obj" - -@erase "$(INTDIR)\e_atan2.obj" - -@erase "$(INTDIR)\e_atanh.obj" - -@erase "$(INTDIR)\e_cosh.obj" - -@erase "$(INTDIR)\e_exp.obj" - -@erase "$(INTDIR)\e_fmod.obj" - -@erase "$(INTDIR)\e_gamma.obj" - -@erase "$(INTDIR)\e_gamma_r.obj" - -@erase "$(INTDIR)\e_hypot.obj" - -@erase "$(INTDIR)\e_j0.obj" - -@erase "$(INTDIR)\e_j1.obj" - -@erase "$(INTDIR)\e_jn.obj" - -@erase "$(INTDIR)\e_lgamma.obj" - -@erase "$(INTDIR)\e_lgamma_r.obj" - -@erase "$(INTDIR)\e_log.obj" - -@erase "$(INTDIR)\e_log10.obj" - -@erase "$(INTDIR)\e_pow.obj" - -@erase "$(INTDIR)\e_rem_pio2.obj" - -@erase "$(INTDIR)\e_remainder.obj" - -@erase "$(INTDIR)\e_scalb.obj" - -@erase "$(INTDIR)\e_sinh.obj" - -@erase "$(INTDIR)\e_sqrt.obj" - -@erase "$(INTDIR)\k_cos.obj" - -@erase "$(INTDIR)\k_rem_pio2.obj" - -@erase "$(INTDIR)\k_sin.obj" - -@erase "$(INTDIR)\k_standard.obj" - -@erase "$(INTDIR)\k_tan.obj" - -@erase "$(INTDIR)\s_asinh.obj" - -@erase "$(INTDIR)\s_atan.obj" - -@erase "$(INTDIR)\s_cbrt.obj" - -@erase "$(INTDIR)\s_ceil.obj" - -@erase "$(INTDIR)\s_copysign.obj" - -@erase "$(INTDIR)\s_cos.obj" - -@erase "$(INTDIR)\s_erf.obj" - -@erase "$(INTDIR)\s_expm1.obj" - -@erase "$(INTDIR)\s_fabs.obj" - -@erase "$(INTDIR)\s_finite.obj" - -@erase "$(INTDIR)\s_floor.obj" - -@erase "$(INTDIR)\s_frexp.obj" - -@erase "$(INTDIR)\s_ilogb.obj" - -@erase "$(INTDIR)\s_isnan.obj" - -@erase "$(INTDIR)\s_ldexp.obj" - -@erase "$(INTDIR)\s_lib_version.obj" - -@erase "$(INTDIR)\s_log1p.obj" - -@erase "$(INTDIR)\s_logb.obj" - -@erase "$(INTDIR)\s_matherr.obj" - -@erase "$(INTDIR)\s_modf.obj" - -@erase "$(INTDIR)\s_nextafter.obj" - -@erase "$(INTDIR)\s_rint.obj" - -@erase "$(INTDIR)\s_scalbn.obj" - -@erase "$(INTDIR)\s_signgam.obj" - -@erase "$(INTDIR)\s_significand.obj" - -@erase "$(INTDIR)\s_sin.obj" - -@erase "$(INTDIR)\s_tan.obj" - -@erase "$(INTDIR)\s_tanh.obj" - -@erase "$(INTDIR)\w_acos.obj" - -@erase "$(INTDIR)\w_acosh.obj" - -@erase "$(INTDIR)\w_asin.obj" - -@erase "$(INTDIR)\w_atan2.obj" - -@erase "$(INTDIR)\w_atanh.obj" - -@erase "$(INTDIR)\w_cosh.obj" - -@erase "$(INTDIR)\w_exp.obj" - -@erase "$(INTDIR)\w_fmod.obj" - -@erase "$(INTDIR)\w_gamma.obj" - -@erase "$(INTDIR)\w_gamma_r.obj" - -@erase "$(INTDIR)\w_hypot.obj" - -@erase "$(INTDIR)\w_j0.obj" - -@erase "$(INTDIR)\w_j1.obj" - -@erase "$(INTDIR)\w_jn.obj" - -@erase "$(INTDIR)\w_lgamma.obj" - -@erase "$(INTDIR)\w_lgamma_r.obj" - -@erase "$(INTDIR)\w_log.obj" - -@erase "$(INTDIR)\w_log10.obj" - -@erase "$(INTDIR)\w_pow.obj" - -@erase "$(INTDIR)\w_remainder.obj" - -@erase "$(INTDIR)\w_scalb.obj" - -@erase "$(INTDIR)\w_sinh.obj" - -@erase "$(INTDIR)\w_sqrt.obj" - -@erase "$(OUTDIR)\fdlibm.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\ - /Fp"$(INTDIR)/fdlibm.pch" /YX /Fo"$(INTDIR)/" /c -CPP_OBJS=.\fdlibm__/ -CPP_SBRS=.\. -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/fdlibm.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo -LIB32_FLAGS=/nologo /out:"$(OUTDIR)/fdlibm.lib" -LIB32_OBJS= \ - "$(INTDIR)\e_acos.obj" \ - "$(INTDIR)\e_acosh.obj" \ - "$(INTDIR)\e_asin.obj" \ - "$(INTDIR)\e_atan2.obj" \ - "$(INTDIR)\e_atanh.obj" \ - "$(INTDIR)\e_cosh.obj" \ - "$(INTDIR)\e_exp.obj" \ - "$(INTDIR)\e_fmod.obj" \ - "$(INTDIR)\e_gamma.obj" \ - "$(INTDIR)\e_gamma_r.obj" \ - "$(INTDIR)\e_hypot.obj" \ - "$(INTDIR)\e_j0.obj" \ - "$(INTDIR)\e_j1.obj" \ - "$(INTDIR)\e_jn.obj" \ - "$(INTDIR)\e_lgamma.obj" \ - "$(INTDIR)\e_lgamma_r.obj" \ - "$(INTDIR)\e_log.obj" \ - "$(INTDIR)\e_log10.obj" \ - "$(INTDIR)\e_pow.obj" \ - "$(INTDIR)\e_rem_pio2.obj" \ - "$(INTDIR)\e_remainder.obj" \ - "$(INTDIR)\e_scalb.obj" \ - "$(INTDIR)\e_sinh.obj" \ - "$(INTDIR)\e_sqrt.obj" \ - "$(INTDIR)\k_cos.obj" \ - "$(INTDIR)\k_rem_pio2.obj" \ - "$(INTDIR)\k_sin.obj" \ - "$(INTDIR)\k_standard.obj" \ - "$(INTDIR)\k_tan.obj" \ - "$(INTDIR)\s_asinh.obj" \ - "$(INTDIR)\s_atan.obj" \ - "$(INTDIR)\s_cbrt.obj" \ - "$(INTDIR)\s_ceil.obj" \ - "$(INTDIR)\s_copysign.obj" \ - "$(INTDIR)\s_cos.obj" \ - "$(INTDIR)\s_erf.obj" \ - "$(INTDIR)\s_expm1.obj" \ - "$(INTDIR)\s_fabs.obj" \ - "$(INTDIR)\s_finite.obj" \ - "$(INTDIR)\s_floor.obj" \ - "$(INTDIR)\s_frexp.obj" \ - "$(INTDIR)\s_ilogb.obj" \ - "$(INTDIR)\s_isnan.obj" \ - "$(INTDIR)\s_ldexp.obj" \ - "$(INTDIR)\s_lib_version.obj" \ - "$(INTDIR)\s_log1p.obj" \ - "$(INTDIR)\s_logb.obj" \ - "$(INTDIR)\s_matherr.obj" \ - "$(INTDIR)\s_modf.obj" \ - "$(INTDIR)\s_nextafter.obj" \ - "$(INTDIR)\s_rint.obj" \ - "$(INTDIR)\s_scalbn.obj" \ - "$(INTDIR)\s_signgam.obj" \ - "$(INTDIR)\s_significand.obj" \ - "$(INTDIR)\s_sin.obj" \ - "$(INTDIR)\s_tan.obj" \ - "$(INTDIR)\s_tanh.obj" \ - "$(INTDIR)\w_acos.obj" \ - "$(INTDIR)\w_acosh.obj" \ - "$(INTDIR)\w_asin.obj" \ - "$(INTDIR)\w_atan2.obj" \ - "$(INTDIR)\w_atanh.obj" \ - "$(INTDIR)\w_cosh.obj" \ - "$(INTDIR)\w_exp.obj" \ - "$(INTDIR)\w_fmod.obj" \ - "$(INTDIR)\w_gamma.obj" \ - "$(INTDIR)\w_gamma_r.obj" \ - "$(INTDIR)\w_hypot.obj" \ - "$(INTDIR)\w_j0.obj" \ - "$(INTDIR)\w_j1.obj" \ - "$(INTDIR)\w_jn.obj" \ - "$(INTDIR)\w_lgamma.obj" \ - "$(INTDIR)\w_lgamma_r.obj" \ - "$(INTDIR)\w_log.obj" \ - "$(INTDIR)\w_log10.obj" \ - "$(INTDIR)\w_pow.obj" \ - "$(INTDIR)\w_remainder.obj" \ - "$(INTDIR)\w_scalb.obj" \ - "$(INTDIR)\w_sinh.obj" \ - "$(INTDIR)\w_sqrt.obj" - -"$(OUTDIR)\fdlibm.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "fdlibm - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "fdlibm_0" -# PROP BASE Intermediate_Dir "fdlibm_0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "fdlibm_0" -# PROP Intermediate_Dir "fdlibm_0" -# PROP Target_Dir "" -OUTDIR=.\fdlibm_0 -INTDIR=.\fdlibm_0 - -ALL : "$(OUTDIR)\fdlibm.lib" - -CLEAN : - -@erase "$(INTDIR)\e_acos.obj" - -@erase "$(INTDIR)\e_acosh.obj" - -@erase "$(INTDIR)\e_asin.obj" - -@erase "$(INTDIR)\e_atan2.obj" - -@erase "$(INTDIR)\e_atanh.obj" - -@erase "$(INTDIR)\e_cosh.obj" - -@erase "$(INTDIR)\e_exp.obj" - -@erase "$(INTDIR)\e_fmod.obj" - -@erase "$(INTDIR)\e_gamma.obj" - -@erase "$(INTDIR)\e_gamma_r.obj" - -@erase "$(INTDIR)\e_hypot.obj" - -@erase "$(INTDIR)\e_j0.obj" - -@erase "$(INTDIR)\e_j1.obj" - -@erase "$(INTDIR)\e_jn.obj" - -@erase "$(INTDIR)\e_lgamma.obj" - -@erase "$(INTDIR)\e_lgamma_r.obj" - -@erase "$(INTDIR)\e_log.obj" - -@erase "$(INTDIR)\e_log10.obj" - -@erase "$(INTDIR)\e_pow.obj" - -@erase "$(INTDIR)\e_rem_pio2.obj" - -@erase "$(INTDIR)\e_remainder.obj" - -@erase "$(INTDIR)\e_scalb.obj" - -@erase "$(INTDIR)\e_sinh.obj" - -@erase "$(INTDIR)\e_sqrt.obj" - -@erase "$(INTDIR)\k_cos.obj" - -@erase "$(INTDIR)\k_rem_pio2.obj" - -@erase "$(INTDIR)\k_sin.obj" - -@erase "$(INTDIR)\k_standard.obj" - -@erase "$(INTDIR)\k_tan.obj" - -@erase "$(INTDIR)\s_asinh.obj" - -@erase "$(INTDIR)\s_atan.obj" - -@erase "$(INTDIR)\s_cbrt.obj" - -@erase "$(INTDIR)\s_ceil.obj" - -@erase "$(INTDIR)\s_copysign.obj" - -@erase "$(INTDIR)\s_cos.obj" - -@erase "$(INTDIR)\s_erf.obj" - -@erase "$(INTDIR)\s_expm1.obj" - -@erase "$(INTDIR)\s_fabs.obj" - -@erase "$(INTDIR)\s_finite.obj" - -@erase "$(INTDIR)\s_floor.obj" - -@erase "$(INTDIR)\s_frexp.obj" - -@erase "$(INTDIR)\s_ilogb.obj" - -@erase "$(INTDIR)\s_isnan.obj" - -@erase "$(INTDIR)\s_ldexp.obj" - -@erase "$(INTDIR)\s_lib_version.obj" - -@erase "$(INTDIR)\s_log1p.obj" - -@erase "$(INTDIR)\s_logb.obj" - -@erase "$(INTDIR)\s_matherr.obj" - -@erase "$(INTDIR)\s_modf.obj" - -@erase "$(INTDIR)\s_nextafter.obj" - -@erase "$(INTDIR)\s_rint.obj" - -@erase "$(INTDIR)\s_scalbn.obj" - -@erase "$(INTDIR)\s_signgam.obj" - -@erase "$(INTDIR)\s_significand.obj" - -@erase "$(INTDIR)\s_sin.obj" - -@erase "$(INTDIR)\s_tan.obj" - -@erase "$(INTDIR)\s_tanh.obj" - -@erase "$(INTDIR)\w_acos.obj" - -@erase "$(INTDIR)\w_acosh.obj" - -@erase "$(INTDIR)\w_asin.obj" - -@erase "$(INTDIR)\w_atan2.obj" - -@erase "$(INTDIR)\w_atanh.obj" - -@erase "$(INTDIR)\w_cosh.obj" - -@erase "$(INTDIR)\w_exp.obj" - -@erase "$(INTDIR)\w_fmod.obj" - -@erase "$(INTDIR)\w_gamma.obj" - -@erase "$(INTDIR)\w_gamma_r.obj" - -@erase "$(INTDIR)\w_hypot.obj" - -@erase "$(INTDIR)\w_j0.obj" - -@erase "$(INTDIR)\w_j1.obj" - -@erase "$(INTDIR)\w_jn.obj" - -@erase "$(INTDIR)\w_lgamma.obj" - -@erase "$(INTDIR)\w_lgamma_r.obj" - -@erase "$(INTDIR)\w_log.obj" - -@erase "$(INTDIR)\w_log10.obj" - -@erase "$(INTDIR)\w_pow.obj" - -@erase "$(INTDIR)\w_remainder.obj" - -@erase "$(INTDIR)\w_scalb.obj" - -@erase "$(INTDIR)\w_sinh.obj" - -@erase "$(INTDIR)\w_sqrt.obj" - -@erase "$(OUTDIR)\fdlibm.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -CPP_PROJ=/nologo /MLd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ - /Fp"$(INTDIR)/fdlibm.pch" /YX /Fo"$(INTDIR)/" /c -CPP_OBJS=.\fdlibm_0/ -CPP_SBRS=.\. -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/fdlibm.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo -LIB32_FLAGS=/nologo /out:"$(OUTDIR)/fdlibm.lib" -LIB32_OBJS= \ - "$(INTDIR)\e_acos.obj" \ - "$(INTDIR)\e_acosh.obj" \ - "$(INTDIR)\e_asin.obj" \ - "$(INTDIR)\e_atan2.obj" \ - "$(INTDIR)\e_atanh.obj" \ - "$(INTDIR)\e_cosh.obj" \ - "$(INTDIR)\e_exp.obj" \ - "$(INTDIR)\e_fmod.obj" \ - "$(INTDIR)\e_gamma.obj" \ - "$(INTDIR)\e_gamma_r.obj" \ - "$(INTDIR)\e_hypot.obj" \ - "$(INTDIR)\e_j0.obj" \ - "$(INTDIR)\e_j1.obj" \ - "$(INTDIR)\e_jn.obj" \ - "$(INTDIR)\e_lgamma.obj" \ - "$(INTDIR)\e_lgamma_r.obj" \ - "$(INTDIR)\e_log.obj" \ - "$(INTDIR)\e_log10.obj" \ - "$(INTDIR)\e_pow.obj" \ - "$(INTDIR)\e_rem_pio2.obj" \ - "$(INTDIR)\e_remainder.obj" \ - "$(INTDIR)\e_scalb.obj" \ - "$(INTDIR)\e_sinh.obj" \ - "$(INTDIR)\e_sqrt.obj" \ - "$(INTDIR)\k_cos.obj" \ - "$(INTDIR)\k_rem_pio2.obj" \ - "$(INTDIR)\k_sin.obj" \ - "$(INTDIR)\k_standard.obj" \ - "$(INTDIR)\k_tan.obj" \ - "$(INTDIR)\s_asinh.obj" \ - "$(INTDIR)\s_atan.obj" \ - "$(INTDIR)\s_cbrt.obj" \ - "$(INTDIR)\s_ceil.obj" \ - "$(INTDIR)\s_copysign.obj" \ - "$(INTDIR)\s_cos.obj" \ - "$(INTDIR)\s_erf.obj" \ - "$(INTDIR)\s_expm1.obj" \ - "$(INTDIR)\s_fabs.obj" \ - "$(INTDIR)\s_finite.obj" \ - "$(INTDIR)\s_floor.obj" \ - "$(INTDIR)\s_frexp.obj" \ - "$(INTDIR)\s_ilogb.obj" \ - "$(INTDIR)\s_isnan.obj" \ - "$(INTDIR)\s_ldexp.obj" \ - "$(INTDIR)\s_lib_version.obj" \ - "$(INTDIR)\s_log1p.obj" \ - "$(INTDIR)\s_logb.obj" \ - "$(INTDIR)\s_matherr.obj" \ - "$(INTDIR)\s_modf.obj" \ - "$(INTDIR)\s_nextafter.obj" \ - "$(INTDIR)\s_rint.obj" \ - "$(INTDIR)\s_scalbn.obj" \ - "$(INTDIR)\s_signgam.obj" \ - "$(INTDIR)\s_significand.obj" \ - "$(INTDIR)\s_sin.obj" \ - "$(INTDIR)\s_tan.obj" \ - "$(INTDIR)\s_tanh.obj" \ - "$(INTDIR)\w_acos.obj" \ - "$(INTDIR)\w_acosh.obj" \ - "$(INTDIR)\w_asin.obj" \ - "$(INTDIR)\w_atan2.obj" \ - "$(INTDIR)\w_atanh.obj" \ - "$(INTDIR)\w_cosh.obj" \ - "$(INTDIR)\w_exp.obj" \ - "$(INTDIR)\w_fmod.obj" \ - "$(INTDIR)\w_gamma.obj" \ - "$(INTDIR)\w_gamma_r.obj" \ - "$(INTDIR)\w_hypot.obj" \ - "$(INTDIR)\w_j0.obj" \ - "$(INTDIR)\w_j1.obj" \ - "$(INTDIR)\w_jn.obj" \ - "$(INTDIR)\w_lgamma.obj" \ - "$(INTDIR)\w_lgamma_r.obj" \ - "$(INTDIR)\w_log.obj" \ - "$(INTDIR)\w_log10.obj" \ - "$(INTDIR)\w_pow.obj" \ - "$(INTDIR)\w_remainder.obj" \ - "$(INTDIR)\w_scalb.obj" \ - "$(INTDIR)\w_sinh.obj" \ - "$(INTDIR)\w_sqrt.obj" - -"$(OUTDIR)\fdlibm.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.cpp{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.cxx{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.c{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -.cpp{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -.cxx{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -################################################################################ -# Begin Target - -# Name "fdlibm - Win32 Release" -# Name "fdlibm - Win32 Debug" - -!IF "$(CFG)" == "fdlibm - Win32 Release" - -!ELSEIF "$(CFG)" == "fdlibm - Win32 Debug" - -!ENDIF - -################################################################################ -# Begin Source File - -SOURCE=.\w_sqrt.c -DEP_CPP_W_SQR=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_sqrt.obj" : $(SOURCE) $(DEP_CPP_W_SQR) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_acosh.c -DEP_CPP_E_ACO=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_acosh.obj" : $(SOURCE) $(DEP_CPP_E_ACO) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_asin.c -DEP_CPP_E_ASI=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_asin.obj" : $(SOURCE) $(DEP_CPP_E_ASI) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_atan2.c -DEP_CPP_E_ATA=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_atan2.obj" : $(SOURCE) $(DEP_CPP_E_ATA) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_atanh.c -DEP_CPP_E_ATAN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_atanh.obj" : $(SOURCE) $(DEP_CPP_E_ATAN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_cosh.c -DEP_CPP_E_COS=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_cosh.obj" : $(SOURCE) $(DEP_CPP_E_COS) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_exp.c -DEP_CPP_E_EXP=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_exp.obj" : $(SOURCE) $(DEP_CPP_E_EXP) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_fmod.c -DEP_CPP_E_FMO=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_fmod.obj" : $(SOURCE) $(DEP_CPP_E_FMO) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_gamma.c -DEP_CPP_E_GAM=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_gamma.obj" : $(SOURCE) $(DEP_CPP_E_GAM) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_gamma_r.c -DEP_CPP_E_GAMM=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_gamma_r.obj" : $(SOURCE) $(DEP_CPP_E_GAMM) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_hypot.c -DEP_CPP_E_HYP=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_hypot.obj" : $(SOURCE) $(DEP_CPP_E_HYP) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_j0.c -DEP_CPP_E_J0_=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_j0.obj" : $(SOURCE) $(DEP_CPP_E_J0_) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_j1.c -DEP_CPP_E_J1_=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_j1.obj" : $(SOURCE) $(DEP_CPP_E_J1_) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_jn.c -DEP_CPP_E_JN_=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_jn.obj" : $(SOURCE) $(DEP_CPP_E_JN_) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_lgamma.c -DEP_CPP_E_LGA=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_lgamma.obj" : $(SOURCE) $(DEP_CPP_E_LGA) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_lgamma_r.c -DEP_CPP_E_LGAM=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_lgamma_r.obj" : $(SOURCE) $(DEP_CPP_E_LGAM) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_log.c -DEP_CPP_E_LOG=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_log.obj" : $(SOURCE) $(DEP_CPP_E_LOG) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_log10.c -DEP_CPP_E_LOG1=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_log10.obj" : $(SOURCE) $(DEP_CPP_E_LOG1) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_pow.c -DEP_CPP_E_POW=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_pow.obj" : $(SOURCE) $(DEP_CPP_E_POW) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_rem_pio2.c -DEP_CPP_E_REM=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_rem_pio2.obj" : $(SOURCE) $(DEP_CPP_E_REM) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_remainder.c -DEP_CPP_E_REMA=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_remainder.obj" : $(SOURCE) $(DEP_CPP_E_REMA) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_scalb.c -DEP_CPP_E_SCA=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_scalb.obj" : $(SOURCE) $(DEP_CPP_E_SCA) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_sinh.c -DEP_CPP_E_SIN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_sinh.obj" : $(SOURCE) $(DEP_CPP_E_SIN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_sqrt.c -DEP_CPP_E_SQR=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_sqrt.obj" : $(SOURCE) $(DEP_CPP_E_SQR) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\fdlibm.h - -!IF "$(CFG)" == "fdlibm - Win32 Release" - -!ELSEIF "$(CFG)" == "fdlibm - Win32 Debug" - -!ENDIF - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\k_cos.c -DEP_CPP_K_COS=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\k_cos.obj" : $(SOURCE) $(DEP_CPP_K_COS) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\k_rem_pio2.c -DEP_CPP_K_REM=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\k_rem_pio2.obj" : $(SOURCE) $(DEP_CPP_K_REM) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\k_sin.c -DEP_CPP_K_SIN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\k_sin.obj" : $(SOURCE) $(DEP_CPP_K_SIN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\k_standard.c -DEP_CPP_K_STA=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\k_standard.obj" : $(SOURCE) $(DEP_CPP_K_STA) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\k_tan.c -DEP_CPP_K_TAN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\k_tan.obj" : $(SOURCE) $(DEP_CPP_K_TAN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_asinh.c -DEP_CPP_S_ASI=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_asinh.obj" : $(SOURCE) $(DEP_CPP_S_ASI) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_atan.c -DEP_CPP_S_ATA=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_atan.obj" : $(SOURCE) $(DEP_CPP_S_ATA) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_cbrt.c -DEP_CPP_S_CBR=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_cbrt.obj" : $(SOURCE) $(DEP_CPP_S_CBR) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_ceil.c -DEP_CPP_S_CEI=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_ceil.obj" : $(SOURCE) $(DEP_CPP_S_CEI) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_copysign.c -DEP_CPP_S_COP=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_copysign.obj" : $(SOURCE) $(DEP_CPP_S_COP) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_cos.c -DEP_CPP_S_COS=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_cos.obj" : $(SOURCE) $(DEP_CPP_S_COS) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_erf.c -DEP_CPP_S_ERF=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_erf.obj" : $(SOURCE) $(DEP_CPP_S_ERF) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_expm1.c -DEP_CPP_S_EXP=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_expm1.obj" : $(SOURCE) $(DEP_CPP_S_EXP) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_fabs.c -DEP_CPP_S_FAB=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_fabs.obj" : $(SOURCE) $(DEP_CPP_S_FAB) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_finite.c -DEP_CPP_S_FIN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_finite.obj" : $(SOURCE) $(DEP_CPP_S_FIN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_floor.c -DEP_CPP_S_FLO=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_floor.obj" : $(SOURCE) $(DEP_CPP_S_FLO) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_frexp.c -DEP_CPP_S_FRE=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_frexp.obj" : $(SOURCE) $(DEP_CPP_S_FRE) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_ilogb.c -DEP_CPP_S_ILO=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_ilogb.obj" : $(SOURCE) $(DEP_CPP_S_ILO) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_isnan.c -DEP_CPP_S_ISN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_isnan.obj" : $(SOURCE) $(DEP_CPP_S_ISN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_ldexp.c -DEP_CPP_S_LDE=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_ldexp.obj" : $(SOURCE) $(DEP_CPP_S_LDE) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_lib_version.c -DEP_CPP_S_LIB=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_lib_version.obj" : $(SOURCE) $(DEP_CPP_S_LIB) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_log1p.c -DEP_CPP_S_LOG=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_log1p.obj" : $(SOURCE) $(DEP_CPP_S_LOG) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_logb.c -DEP_CPP_S_LOGB=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_logb.obj" : $(SOURCE) $(DEP_CPP_S_LOGB) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_matherr.c -DEP_CPP_S_MAT=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_matherr.obj" : $(SOURCE) $(DEP_CPP_S_MAT) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_modf.c -DEP_CPP_S_MOD=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_modf.obj" : $(SOURCE) $(DEP_CPP_S_MOD) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_nextafter.c -DEP_CPP_S_NEX=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_nextafter.obj" : $(SOURCE) $(DEP_CPP_S_NEX) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_rint.c -DEP_CPP_S_RIN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_rint.obj" : $(SOURCE) $(DEP_CPP_S_RIN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_scalbn.c -DEP_CPP_S_SCA=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_scalbn.obj" : $(SOURCE) $(DEP_CPP_S_SCA) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_signgam.c -DEP_CPP_S_SIG=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_signgam.obj" : $(SOURCE) $(DEP_CPP_S_SIG) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_significand.c -DEP_CPP_S_SIGN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_significand.obj" : $(SOURCE) $(DEP_CPP_S_SIGN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_sin.c -DEP_CPP_S_SIN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_sin.obj" : $(SOURCE) $(DEP_CPP_S_SIN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_tan.c -DEP_CPP_S_TAN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_tan.obj" : $(SOURCE) $(DEP_CPP_S_TAN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\s_tanh.c -DEP_CPP_S_TANH=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\s_tanh.obj" : $(SOURCE) $(DEP_CPP_S_TANH) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_acos.c -DEP_CPP_W_ACO=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_acos.obj" : $(SOURCE) $(DEP_CPP_W_ACO) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_acosh.c -DEP_CPP_W_ACOS=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_acosh.obj" : $(SOURCE) $(DEP_CPP_W_ACOS) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_asin.c -DEP_CPP_W_ASI=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_asin.obj" : $(SOURCE) $(DEP_CPP_W_ASI) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_atan2.c -DEP_CPP_W_ATA=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_atan2.obj" : $(SOURCE) $(DEP_CPP_W_ATA) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_atanh.c -DEP_CPP_W_ATAN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_atanh.obj" : $(SOURCE) $(DEP_CPP_W_ATAN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_cosh.c -DEP_CPP_W_COS=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_cosh.obj" : $(SOURCE) $(DEP_CPP_W_COS) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_exp.c -DEP_CPP_W_EXP=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_exp.obj" : $(SOURCE) $(DEP_CPP_W_EXP) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_fmod.c -DEP_CPP_W_FMO=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_fmod.obj" : $(SOURCE) $(DEP_CPP_W_FMO) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_gamma.c -DEP_CPP_W_GAM=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_gamma.obj" : $(SOURCE) $(DEP_CPP_W_GAM) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_gamma_r.c -DEP_CPP_W_GAMM=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_gamma_r.obj" : $(SOURCE) $(DEP_CPP_W_GAMM) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_hypot.c -DEP_CPP_W_HYP=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_hypot.obj" : $(SOURCE) $(DEP_CPP_W_HYP) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_j0.c -DEP_CPP_W_J0_=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_j0.obj" : $(SOURCE) $(DEP_CPP_W_J0_) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_j1.c -DEP_CPP_W_J1_=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_j1.obj" : $(SOURCE) $(DEP_CPP_W_J1_) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_jn.c -DEP_CPP_W_JN_=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_jn.obj" : $(SOURCE) $(DEP_CPP_W_JN_) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_lgamma.c -DEP_CPP_W_LGA=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_lgamma.obj" : $(SOURCE) $(DEP_CPP_W_LGA) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_lgamma_r.c -DEP_CPP_W_LGAM=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_lgamma_r.obj" : $(SOURCE) $(DEP_CPP_W_LGAM) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_log.c -DEP_CPP_W_LOG=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_log.obj" : $(SOURCE) $(DEP_CPP_W_LOG) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_log10.c -DEP_CPP_W_LOG1=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_log10.obj" : $(SOURCE) $(DEP_CPP_W_LOG1) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_pow.c -DEP_CPP_W_POW=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_pow.obj" : $(SOURCE) $(DEP_CPP_W_POW) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_remainder.c -DEP_CPP_W_REM=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_remainder.obj" : $(SOURCE) $(DEP_CPP_W_REM) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_scalb.c -DEP_CPP_W_SCA=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_scalb.obj" : $(SOURCE) $(DEP_CPP_W_SCA) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\w_sinh.c -DEP_CPP_W_SIN=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\w_sinh.obj" : $(SOURCE) $(DEP_CPP_W_SIN) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\e_acos.c -DEP_CPP_E_ACOS=\ - ".\fdlibm.h"\ - - -"$(INTDIR)\e_acos.obj" : $(SOURCE) $(DEP_CPP_E_ACOS) "$(INTDIR)" - - -# End Source File -# End Target -# End Project -################################################################################ +# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +!IF "$(CFG)" == "" +CFG=fdlibm - Win32 Debug +!MESSAGE No configuration specified. Defaulting to fdlibm - Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "fdlibm - Win32 Release" && "$(CFG)" != "fdlibm - Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!MESSAGE You can specify a configuration when running NMAKE on this makefile +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "fdlibm.mak" CFG="fdlibm - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "fdlibm - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "fdlibm - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF +################################################################################ +# Begin Project +CPP=cl.exe + +!IF "$(CFG)" == "fdlibm - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "fdlibm__" +# PROP BASE Intermediate_Dir "fdlibm__" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "fdlibm__" +# PROP Intermediate_Dir "fdlibm__" +# PROP Target_Dir "" +OUTDIR=.\fdlibm__ +INTDIR=.\fdlibm__ + +ALL : "$(OUTDIR)\fdlibm.lib" + +CLEAN : + -@erase "$(INTDIR)\e_acos.obj" + -@erase "$(INTDIR)\e_acosh.obj" + -@erase "$(INTDIR)\e_asin.obj" + -@erase "$(INTDIR)\e_atan2.obj" + -@erase "$(INTDIR)\e_atanh.obj" + -@erase "$(INTDIR)\e_cosh.obj" + -@erase "$(INTDIR)\e_exp.obj" + -@erase "$(INTDIR)\e_fmod.obj" + -@erase "$(INTDIR)\e_gamma.obj" + -@erase "$(INTDIR)\e_gamma_r.obj" + -@erase "$(INTDIR)\e_hypot.obj" + -@erase "$(INTDIR)\e_j0.obj" + -@erase "$(INTDIR)\e_j1.obj" + -@erase "$(INTDIR)\e_jn.obj" + -@erase "$(INTDIR)\e_lgamma.obj" + -@erase "$(INTDIR)\e_lgamma_r.obj" + -@erase "$(INTDIR)\e_log.obj" + -@erase "$(INTDIR)\e_log10.obj" + -@erase "$(INTDIR)\e_pow.obj" + -@erase "$(INTDIR)\e_rem_pio2.obj" + -@erase "$(INTDIR)\e_remainder.obj" + -@erase "$(INTDIR)\e_scalb.obj" + -@erase "$(INTDIR)\e_sinh.obj" + -@erase "$(INTDIR)\e_sqrt.obj" + -@erase "$(INTDIR)\k_cos.obj" + -@erase "$(INTDIR)\k_rem_pio2.obj" + -@erase "$(INTDIR)\k_sin.obj" + -@erase "$(INTDIR)\k_standard.obj" + -@erase "$(INTDIR)\k_tan.obj" + -@erase "$(INTDIR)\s_asinh.obj" + -@erase "$(INTDIR)\s_atan.obj" + -@erase "$(INTDIR)\s_cbrt.obj" + -@erase "$(INTDIR)\s_ceil.obj" + -@erase "$(INTDIR)\s_copysign.obj" + -@erase "$(INTDIR)\s_cos.obj" + -@erase "$(INTDIR)\s_erf.obj" + -@erase "$(INTDIR)\s_expm1.obj" + -@erase "$(INTDIR)\s_fabs.obj" + -@erase "$(INTDIR)\s_finite.obj" + -@erase "$(INTDIR)\s_floor.obj" + -@erase "$(INTDIR)\s_frexp.obj" + -@erase "$(INTDIR)\s_ilogb.obj" + -@erase "$(INTDIR)\s_isnan.obj" + -@erase "$(INTDIR)\s_ldexp.obj" + -@erase "$(INTDIR)\s_lib_version.obj" + -@erase "$(INTDIR)\s_log1p.obj" + -@erase "$(INTDIR)\s_logb.obj" + -@erase "$(INTDIR)\s_matherr.obj" + -@erase "$(INTDIR)\s_modf.obj" + -@erase "$(INTDIR)\s_nextafter.obj" + -@erase "$(INTDIR)\s_rint.obj" + -@erase "$(INTDIR)\s_scalbn.obj" + -@erase "$(INTDIR)\s_signgam.obj" + -@erase "$(INTDIR)\s_significand.obj" + -@erase "$(INTDIR)\s_sin.obj" + -@erase "$(INTDIR)\s_tan.obj" + -@erase "$(INTDIR)\s_tanh.obj" + -@erase "$(INTDIR)\w_acos.obj" + -@erase "$(INTDIR)\w_acosh.obj" + -@erase "$(INTDIR)\w_asin.obj" + -@erase "$(INTDIR)\w_atan2.obj" + -@erase "$(INTDIR)\w_atanh.obj" + -@erase "$(INTDIR)\w_cosh.obj" + -@erase "$(INTDIR)\w_exp.obj" + -@erase "$(INTDIR)\w_fmod.obj" + -@erase "$(INTDIR)\w_gamma.obj" + -@erase "$(INTDIR)\w_gamma_r.obj" + -@erase "$(INTDIR)\w_hypot.obj" + -@erase "$(INTDIR)\w_j0.obj" + -@erase "$(INTDIR)\w_j1.obj" + -@erase "$(INTDIR)\w_jn.obj" + -@erase "$(INTDIR)\w_lgamma.obj" + -@erase "$(INTDIR)\w_lgamma_r.obj" + -@erase "$(INTDIR)\w_log.obj" + -@erase "$(INTDIR)\w_log10.obj" + -@erase "$(INTDIR)\w_pow.obj" + -@erase "$(INTDIR)\w_remainder.obj" + -@erase "$(INTDIR)\w_scalb.obj" + -@erase "$(INTDIR)\w_sinh.obj" + -@erase "$(INTDIR)\w_sqrt.obj" + -@erase "$(OUTDIR)\fdlibm.lib" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c +# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c +CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)/fdlibm.pch" /YX /Fo"$(INTDIR)/" /c +CPP_OBJS=.\fdlibm__/ +CPP_SBRS=.\. +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +BSC32_FLAGS=/nologo /o"$(OUTDIR)/fdlibm.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +LIB32_FLAGS=/nologo /out:"$(OUTDIR)/fdlibm.lib" +LIB32_OBJS= \ + "$(INTDIR)\e_acos.obj" \ + "$(INTDIR)\e_acosh.obj" \ + "$(INTDIR)\e_asin.obj" \ + "$(INTDIR)\e_atan2.obj" \ + "$(INTDIR)\e_atanh.obj" \ + "$(INTDIR)\e_cosh.obj" \ + "$(INTDIR)\e_exp.obj" \ + "$(INTDIR)\e_fmod.obj" \ + "$(INTDIR)\e_gamma.obj" \ + "$(INTDIR)\e_gamma_r.obj" \ + "$(INTDIR)\e_hypot.obj" \ + "$(INTDIR)\e_j0.obj" \ + "$(INTDIR)\e_j1.obj" \ + "$(INTDIR)\e_jn.obj" \ + "$(INTDIR)\e_lgamma.obj" \ + "$(INTDIR)\e_lgamma_r.obj" \ + "$(INTDIR)\e_log.obj" \ + "$(INTDIR)\e_log10.obj" \ + "$(INTDIR)\e_pow.obj" \ + "$(INTDIR)\e_rem_pio2.obj" \ + "$(INTDIR)\e_remainder.obj" \ + "$(INTDIR)\e_scalb.obj" \ + "$(INTDIR)\e_sinh.obj" \ + "$(INTDIR)\e_sqrt.obj" \ + "$(INTDIR)\k_cos.obj" \ + "$(INTDIR)\k_rem_pio2.obj" \ + "$(INTDIR)\k_sin.obj" \ + "$(INTDIR)\k_standard.obj" \ + "$(INTDIR)\k_tan.obj" \ + "$(INTDIR)\s_asinh.obj" \ + "$(INTDIR)\s_atan.obj" \ + "$(INTDIR)\s_cbrt.obj" \ + "$(INTDIR)\s_ceil.obj" \ + "$(INTDIR)\s_copysign.obj" \ + "$(INTDIR)\s_cos.obj" \ + "$(INTDIR)\s_erf.obj" \ + "$(INTDIR)\s_expm1.obj" \ + "$(INTDIR)\s_fabs.obj" \ + "$(INTDIR)\s_finite.obj" \ + "$(INTDIR)\s_floor.obj" \ + "$(INTDIR)\s_frexp.obj" \ + "$(INTDIR)\s_ilogb.obj" \ + "$(INTDIR)\s_isnan.obj" \ + "$(INTDIR)\s_ldexp.obj" \ + "$(INTDIR)\s_lib_version.obj" \ + "$(INTDIR)\s_log1p.obj" \ + "$(INTDIR)\s_logb.obj" \ + "$(INTDIR)\s_matherr.obj" \ + "$(INTDIR)\s_modf.obj" \ + "$(INTDIR)\s_nextafter.obj" \ + "$(INTDIR)\s_rint.obj" \ + "$(INTDIR)\s_scalbn.obj" \ + "$(INTDIR)\s_signgam.obj" \ + "$(INTDIR)\s_significand.obj" \ + "$(INTDIR)\s_sin.obj" \ + "$(INTDIR)\s_tan.obj" \ + "$(INTDIR)\s_tanh.obj" \ + "$(INTDIR)\w_acos.obj" \ + "$(INTDIR)\w_acosh.obj" \ + "$(INTDIR)\w_asin.obj" \ + "$(INTDIR)\w_atan2.obj" \ + "$(INTDIR)\w_atanh.obj" \ + "$(INTDIR)\w_cosh.obj" \ + "$(INTDIR)\w_exp.obj" \ + "$(INTDIR)\w_fmod.obj" \ + "$(INTDIR)\w_gamma.obj" \ + "$(INTDIR)\w_gamma_r.obj" \ + "$(INTDIR)\w_hypot.obj" \ + "$(INTDIR)\w_j0.obj" \ + "$(INTDIR)\w_j1.obj" \ + "$(INTDIR)\w_jn.obj" \ + "$(INTDIR)\w_lgamma.obj" \ + "$(INTDIR)\w_lgamma_r.obj" \ + "$(INTDIR)\w_log.obj" \ + "$(INTDIR)\w_log10.obj" \ + "$(INTDIR)\w_pow.obj" \ + "$(INTDIR)\w_remainder.obj" \ + "$(INTDIR)\w_scalb.obj" \ + "$(INTDIR)\w_sinh.obj" \ + "$(INTDIR)\w_sqrt.obj" + +"$(OUTDIR)\fdlibm.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ELSEIF "$(CFG)" == "fdlibm - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "fdlibm_0" +# PROP BASE Intermediate_Dir "fdlibm_0" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "fdlibm_0" +# PROP Intermediate_Dir "fdlibm_0" +# PROP Target_Dir "" +OUTDIR=.\fdlibm_0 +INTDIR=.\fdlibm_0 + +ALL : "$(OUTDIR)\fdlibm.lib" + +CLEAN : + -@erase "$(INTDIR)\e_acos.obj" + -@erase "$(INTDIR)\e_acosh.obj" + -@erase "$(INTDIR)\e_asin.obj" + -@erase "$(INTDIR)\e_atan2.obj" + -@erase "$(INTDIR)\e_atanh.obj" + -@erase "$(INTDIR)\e_cosh.obj" + -@erase "$(INTDIR)\e_exp.obj" + -@erase "$(INTDIR)\e_fmod.obj" + -@erase "$(INTDIR)\e_gamma.obj" + -@erase "$(INTDIR)\e_gamma_r.obj" + -@erase "$(INTDIR)\e_hypot.obj" + -@erase "$(INTDIR)\e_j0.obj" + -@erase "$(INTDIR)\e_j1.obj" + -@erase "$(INTDIR)\e_jn.obj" + -@erase "$(INTDIR)\e_lgamma.obj" + -@erase "$(INTDIR)\e_lgamma_r.obj" + -@erase "$(INTDIR)\e_log.obj" + -@erase "$(INTDIR)\e_log10.obj" + -@erase "$(INTDIR)\e_pow.obj" + -@erase "$(INTDIR)\e_rem_pio2.obj" + -@erase "$(INTDIR)\e_remainder.obj" + -@erase "$(INTDIR)\e_scalb.obj" + -@erase "$(INTDIR)\e_sinh.obj" + -@erase "$(INTDIR)\e_sqrt.obj" + -@erase "$(INTDIR)\k_cos.obj" + -@erase "$(INTDIR)\k_rem_pio2.obj" + -@erase "$(INTDIR)\k_sin.obj" + -@erase "$(INTDIR)\k_standard.obj" + -@erase "$(INTDIR)\k_tan.obj" + -@erase "$(INTDIR)\s_asinh.obj" + -@erase "$(INTDIR)\s_atan.obj" + -@erase "$(INTDIR)\s_cbrt.obj" + -@erase "$(INTDIR)\s_ceil.obj" + -@erase "$(INTDIR)\s_copysign.obj" + -@erase "$(INTDIR)\s_cos.obj" + -@erase "$(INTDIR)\s_erf.obj" + -@erase "$(INTDIR)\s_expm1.obj" + -@erase "$(INTDIR)\s_fabs.obj" + -@erase "$(INTDIR)\s_finite.obj" + -@erase "$(INTDIR)\s_floor.obj" + -@erase "$(INTDIR)\s_frexp.obj" + -@erase "$(INTDIR)\s_ilogb.obj" + -@erase "$(INTDIR)\s_isnan.obj" + -@erase "$(INTDIR)\s_ldexp.obj" + -@erase "$(INTDIR)\s_lib_version.obj" + -@erase "$(INTDIR)\s_log1p.obj" + -@erase "$(INTDIR)\s_logb.obj" + -@erase "$(INTDIR)\s_matherr.obj" + -@erase "$(INTDIR)\s_modf.obj" + -@erase "$(INTDIR)\s_nextafter.obj" + -@erase "$(INTDIR)\s_rint.obj" + -@erase "$(INTDIR)\s_scalbn.obj" + -@erase "$(INTDIR)\s_signgam.obj" + -@erase "$(INTDIR)\s_significand.obj" + -@erase "$(INTDIR)\s_sin.obj" + -@erase "$(INTDIR)\s_tan.obj" + -@erase "$(INTDIR)\s_tanh.obj" + -@erase "$(INTDIR)\w_acos.obj" + -@erase "$(INTDIR)\w_acosh.obj" + -@erase "$(INTDIR)\w_asin.obj" + -@erase "$(INTDIR)\w_atan2.obj" + -@erase "$(INTDIR)\w_atanh.obj" + -@erase "$(INTDIR)\w_cosh.obj" + -@erase "$(INTDIR)\w_exp.obj" + -@erase "$(INTDIR)\w_fmod.obj" + -@erase "$(INTDIR)\w_gamma.obj" + -@erase "$(INTDIR)\w_gamma_r.obj" + -@erase "$(INTDIR)\w_hypot.obj" + -@erase "$(INTDIR)\w_j0.obj" + -@erase "$(INTDIR)\w_j1.obj" + -@erase "$(INTDIR)\w_jn.obj" + -@erase "$(INTDIR)\w_lgamma.obj" + -@erase "$(INTDIR)\w_lgamma_r.obj" + -@erase "$(INTDIR)\w_log.obj" + -@erase "$(INTDIR)\w_log10.obj" + -@erase "$(INTDIR)\w_pow.obj" + -@erase "$(INTDIR)\w_remainder.obj" + -@erase "$(INTDIR)\w_scalb.obj" + -@erase "$(INTDIR)\w_sinh.obj" + -@erase "$(INTDIR)\w_sqrt.obj" + -@erase "$(OUTDIR)\fdlibm.lib" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c +# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c +CPP_PROJ=/nologo /MLd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)/fdlibm.pch" /YX /Fo"$(INTDIR)/" /c +CPP_OBJS=.\fdlibm_0/ +CPP_SBRS=.\. +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +BSC32_FLAGS=/nologo /o"$(OUTDIR)/fdlibm.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +LIB32_FLAGS=/nologo /out:"$(OUTDIR)/fdlibm.lib" +LIB32_OBJS= \ + "$(INTDIR)\e_acos.obj" \ + "$(INTDIR)\e_acosh.obj" \ + "$(INTDIR)\e_asin.obj" \ + "$(INTDIR)\e_atan2.obj" \ + "$(INTDIR)\e_atanh.obj" \ + "$(INTDIR)\e_cosh.obj" \ + "$(INTDIR)\e_exp.obj" \ + "$(INTDIR)\e_fmod.obj" \ + "$(INTDIR)\e_gamma.obj" \ + "$(INTDIR)\e_gamma_r.obj" \ + "$(INTDIR)\e_hypot.obj" \ + "$(INTDIR)\e_j0.obj" \ + "$(INTDIR)\e_j1.obj" \ + "$(INTDIR)\e_jn.obj" \ + "$(INTDIR)\e_lgamma.obj" \ + "$(INTDIR)\e_lgamma_r.obj" \ + "$(INTDIR)\e_log.obj" \ + "$(INTDIR)\e_log10.obj" \ + "$(INTDIR)\e_pow.obj" \ + "$(INTDIR)\e_rem_pio2.obj" \ + "$(INTDIR)\e_remainder.obj" \ + "$(INTDIR)\e_scalb.obj" \ + "$(INTDIR)\e_sinh.obj" \ + "$(INTDIR)\e_sqrt.obj" \ + "$(INTDIR)\k_cos.obj" \ + "$(INTDIR)\k_rem_pio2.obj" \ + "$(INTDIR)\k_sin.obj" \ + "$(INTDIR)\k_standard.obj" \ + "$(INTDIR)\k_tan.obj" \ + "$(INTDIR)\s_asinh.obj" \ + "$(INTDIR)\s_atan.obj" \ + "$(INTDIR)\s_cbrt.obj" \ + "$(INTDIR)\s_ceil.obj" \ + "$(INTDIR)\s_copysign.obj" \ + "$(INTDIR)\s_cos.obj" \ + "$(INTDIR)\s_erf.obj" \ + "$(INTDIR)\s_expm1.obj" \ + "$(INTDIR)\s_fabs.obj" \ + "$(INTDIR)\s_finite.obj" \ + "$(INTDIR)\s_floor.obj" \ + "$(INTDIR)\s_frexp.obj" \ + "$(INTDIR)\s_ilogb.obj" \ + "$(INTDIR)\s_isnan.obj" \ + "$(INTDIR)\s_ldexp.obj" \ + "$(INTDIR)\s_lib_version.obj" \ + "$(INTDIR)\s_log1p.obj" \ + "$(INTDIR)\s_logb.obj" \ + "$(INTDIR)\s_matherr.obj" \ + "$(INTDIR)\s_modf.obj" \ + "$(INTDIR)\s_nextafter.obj" \ + "$(INTDIR)\s_rint.obj" \ + "$(INTDIR)\s_scalbn.obj" \ + "$(INTDIR)\s_signgam.obj" \ + "$(INTDIR)\s_significand.obj" \ + "$(INTDIR)\s_sin.obj" \ + "$(INTDIR)\s_tan.obj" \ + "$(INTDIR)\s_tanh.obj" \ + "$(INTDIR)\w_acos.obj" \ + "$(INTDIR)\w_acosh.obj" \ + "$(INTDIR)\w_asin.obj" \ + "$(INTDIR)\w_atan2.obj" \ + "$(INTDIR)\w_atanh.obj" \ + "$(INTDIR)\w_cosh.obj" \ + "$(INTDIR)\w_exp.obj" \ + "$(INTDIR)\w_fmod.obj" \ + "$(INTDIR)\w_gamma.obj" \ + "$(INTDIR)\w_gamma_r.obj" \ + "$(INTDIR)\w_hypot.obj" \ + "$(INTDIR)\w_j0.obj" \ + "$(INTDIR)\w_j1.obj" \ + "$(INTDIR)\w_jn.obj" \ + "$(INTDIR)\w_lgamma.obj" \ + "$(INTDIR)\w_lgamma_r.obj" \ + "$(INTDIR)\w_log.obj" \ + "$(INTDIR)\w_log10.obj" \ + "$(INTDIR)\w_pow.obj" \ + "$(INTDIR)\w_remainder.obj" \ + "$(INTDIR)\w_scalb.obj" \ + "$(INTDIR)\w_sinh.obj" \ + "$(INTDIR)\w_sqrt.obj" + +"$(OUTDIR)\fdlibm.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ENDIF + +.c{$(CPP_OBJS)}.obj: + $(CPP) $(CPP_PROJ) $< + +.cpp{$(CPP_OBJS)}.obj: + $(CPP) $(CPP_PROJ) $< + +.cxx{$(CPP_OBJS)}.obj: + $(CPP) $(CPP_PROJ) $< + +.c{$(CPP_SBRS)}.sbr: + $(CPP) $(CPP_PROJ) $< + +.cpp{$(CPP_SBRS)}.sbr: + $(CPP) $(CPP_PROJ) $< + +.cxx{$(CPP_SBRS)}.sbr: + $(CPP) $(CPP_PROJ) $< + +################################################################################ +# Begin Target + +# Name "fdlibm - Win32 Release" +# Name "fdlibm - Win32 Debug" + +!IF "$(CFG)" == "fdlibm - Win32 Release" + +!ELSEIF "$(CFG)" == "fdlibm - Win32 Debug" + +!ENDIF + +################################################################################ +# Begin Source File + +SOURCE=.\w_sqrt.c +DEP_CPP_W_SQR=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_sqrt.obj" : $(SOURCE) $(DEP_CPP_W_SQR) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_acosh.c +DEP_CPP_E_ACO=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_acosh.obj" : $(SOURCE) $(DEP_CPP_E_ACO) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_asin.c +DEP_CPP_E_ASI=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_asin.obj" : $(SOURCE) $(DEP_CPP_E_ASI) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_atan2.c +DEP_CPP_E_ATA=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_atan2.obj" : $(SOURCE) $(DEP_CPP_E_ATA) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_atanh.c +DEP_CPP_E_ATAN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_atanh.obj" : $(SOURCE) $(DEP_CPP_E_ATAN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_cosh.c +DEP_CPP_E_COS=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_cosh.obj" : $(SOURCE) $(DEP_CPP_E_COS) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_exp.c +DEP_CPP_E_EXP=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_exp.obj" : $(SOURCE) $(DEP_CPP_E_EXP) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_fmod.c +DEP_CPP_E_FMO=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_fmod.obj" : $(SOURCE) $(DEP_CPP_E_FMO) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_gamma.c +DEP_CPP_E_GAM=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_gamma.obj" : $(SOURCE) $(DEP_CPP_E_GAM) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_gamma_r.c +DEP_CPP_E_GAMM=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_gamma_r.obj" : $(SOURCE) $(DEP_CPP_E_GAMM) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_hypot.c +DEP_CPP_E_HYP=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_hypot.obj" : $(SOURCE) $(DEP_CPP_E_HYP) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_j0.c +DEP_CPP_E_J0_=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_j0.obj" : $(SOURCE) $(DEP_CPP_E_J0_) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_j1.c +DEP_CPP_E_J1_=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_j1.obj" : $(SOURCE) $(DEP_CPP_E_J1_) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_jn.c +DEP_CPP_E_JN_=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_jn.obj" : $(SOURCE) $(DEP_CPP_E_JN_) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_lgamma.c +DEP_CPP_E_LGA=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_lgamma.obj" : $(SOURCE) $(DEP_CPP_E_LGA) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_lgamma_r.c +DEP_CPP_E_LGAM=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_lgamma_r.obj" : $(SOURCE) $(DEP_CPP_E_LGAM) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_log.c +DEP_CPP_E_LOG=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_log.obj" : $(SOURCE) $(DEP_CPP_E_LOG) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_log10.c +DEP_CPP_E_LOG1=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_log10.obj" : $(SOURCE) $(DEP_CPP_E_LOG1) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_pow.c +DEP_CPP_E_POW=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_pow.obj" : $(SOURCE) $(DEP_CPP_E_POW) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_rem_pio2.c +DEP_CPP_E_REM=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_rem_pio2.obj" : $(SOURCE) $(DEP_CPP_E_REM) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_remainder.c +DEP_CPP_E_REMA=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_remainder.obj" : $(SOURCE) $(DEP_CPP_E_REMA) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_scalb.c +DEP_CPP_E_SCA=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_scalb.obj" : $(SOURCE) $(DEP_CPP_E_SCA) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_sinh.c +DEP_CPP_E_SIN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_sinh.obj" : $(SOURCE) $(DEP_CPP_E_SIN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_sqrt.c +DEP_CPP_E_SQR=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_sqrt.obj" : $(SOURCE) $(DEP_CPP_E_SQR) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\fdlibm.h + +!IF "$(CFG)" == "fdlibm - Win32 Release" + +!ELSEIF "$(CFG)" == "fdlibm - Win32 Debug" + +!ENDIF + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\k_cos.c +DEP_CPP_K_COS=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\k_cos.obj" : $(SOURCE) $(DEP_CPP_K_COS) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\k_rem_pio2.c +DEP_CPP_K_REM=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\k_rem_pio2.obj" : $(SOURCE) $(DEP_CPP_K_REM) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\k_sin.c +DEP_CPP_K_SIN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\k_sin.obj" : $(SOURCE) $(DEP_CPP_K_SIN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\k_standard.c +DEP_CPP_K_STA=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\k_standard.obj" : $(SOURCE) $(DEP_CPP_K_STA) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\k_tan.c +DEP_CPP_K_TAN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\k_tan.obj" : $(SOURCE) $(DEP_CPP_K_TAN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_asinh.c +DEP_CPP_S_ASI=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_asinh.obj" : $(SOURCE) $(DEP_CPP_S_ASI) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_atan.c +DEP_CPP_S_ATA=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_atan.obj" : $(SOURCE) $(DEP_CPP_S_ATA) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_cbrt.c +DEP_CPP_S_CBR=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_cbrt.obj" : $(SOURCE) $(DEP_CPP_S_CBR) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_ceil.c +DEP_CPP_S_CEI=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_ceil.obj" : $(SOURCE) $(DEP_CPP_S_CEI) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_copysign.c +DEP_CPP_S_COP=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_copysign.obj" : $(SOURCE) $(DEP_CPP_S_COP) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_cos.c +DEP_CPP_S_COS=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_cos.obj" : $(SOURCE) $(DEP_CPP_S_COS) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_erf.c +DEP_CPP_S_ERF=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_erf.obj" : $(SOURCE) $(DEP_CPP_S_ERF) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_expm1.c +DEP_CPP_S_EXP=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_expm1.obj" : $(SOURCE) $(DEP_CPP_S_EXP) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_fabs.c +DEP_CPP_S_FAB=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_fabs.obj" : $(SOURCE) $(DEP_CPP_S_FAB) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_finite.c +DEP_CPP_S_FIN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_finite.obj" : $(SOURCE) $(DEP_CPP_S_FIN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_floor.c +DEP_CPP_S_FLO=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_floor.obj" : $(SOURCE) $(DEP_CPP_S_FLO) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_frexp.c +DEP_CPP_S_FRE=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_frexp.obj" : $(SOURCE) $(DEP_CPP_S_FRE) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_ilogb.c +DEP_CPP_S_ILO=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_ilogb.obj" : $(SOURCE) $(DEP_CPP_S_ILO) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_isnan.c +DEP_CPP_S_ISN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_isnan.obj" : $(SOURCE) $(DEP_CPP_S_ISN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_ldexp.c +DEP_CPP_S_LDE=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_ldexp.obj" : $(SOURCE) $(DEP_CPP_S_LDE) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_lib_version.c +DEP_CPP_S_LIB=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_lib_version.obj" : $(SOURCE) $(DEP_CPP_S_LIB) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_log1p.c +DEP_CPP_S_LOG=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_log1p.obj" : $(SOURCE) $(DEP_CPP_S_LOG) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_logb.c +DEP_CPP_S_LOGB=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_logb.obj" : $(SOURCE) $(DEP_CPP_S_LOGB) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_matherr.c +DEP_CPP_S_MAT=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_matherr.obj" : $(SOURCE) $(DEP_CPP_S_MAT) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_modf.c +DEP_CPP_S_MOD=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_modf.obj" : $(SOURCE) $(DEP_CPP_S_MOD) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_nextafter.c +DEP_CPP_S_NEX=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_nextafter.obj" : $(SOURCE) $(DEP_CPP_S_NEX) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_rint.c +DEP_CPP_S_RIN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_rint.obj" : $(SOURCE) $(DEP_CPP_S_RIN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_scalbn.c +DEP_CPP_S_SCA=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_scalbn.obj" : $(SOURCE) $(DEP_CPP_S_SCA) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_signgam.c +DEP_CPP_S_SIG=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_signgam.obj" : $(SOURCE) $(DEP_CPP_S_SIG) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_significand.c +DEP_CPP_S_SIGN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_significand.obj" : $(SOURCE) $(DEP_CPP_S_SIGN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_sin.c +DEP_CPP_S_SIN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_sin.obj" : $(SOURCE) $(DEP_CPP_S_SIN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_tan.c +DEP_CPP_S_TAN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_tan.obj" : $(SOURCE) $(DEP_CPP_S_TAN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\s_tanh.c +DEP_CPP_S_TANH=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\s_tanh.obj" : $(SOURCE) $(DEP_CPP_S_TANH) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_acos.c +DEP_CPP_W_ACO=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_acos.obj" : $(SOURCE) $(DEP_CPP_W_ACO) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_acosh.c +DEP_CPP_W_ACOS=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_acosh.obj" : $(SOURCE) $(DEP_CPP_W_ACOS) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_asin.c +DEP_CPP_W_ASI=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_asin.obj" : $(SOURCE) $(DEP_CPP_W_ASI) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_atan2.c +DEP_CPP_W_ATA=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_atan2.obj" : $(SOURCE) $(DEP_CPP_W_ATA) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_atanh.c +DEP_CPP_W_ATAN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_atanh.obj" : $(SOURCE) $(DEP_CPP_W_ATAN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_cosh.c +DEP_CPP_W_COS=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_cosh.obj" : $(SOURCE) $(DEP_CPP_W_COS) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_exp.c +DEP_CPP_W_EXP=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_exp.obj" : $(SOURCE) $(DEP_CPP_W_EXP) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_fmod.c +DEP_CPP_W_FMO=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_fmod.obj" : $(SOURCE) $(DEP_CPP_W_FMO) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_gamma.c +DEP_CPP_W_GAM=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_gamma.obj" : $(SOURCE) $(DEP_CPP_W_GAM) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_gamma_r.c +DEP_CPP_W_GAMM=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_gamma_r.obj" : $(SOURCE) $(DEP_CPP_W_GAMM) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_hypot.c +DEP_CPP_W_HYP=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_hypot.obj" : $(SOURCE) $(DEP_CPP_W_HYP) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_j0.c +DEP_CPP_W_J0_=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_j0.obj" : $(SOURCE) $(DEP_CPP_W_J0_) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_j1.c +DEP_CPP_W_J1_=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_j1.obj" : $(SOURCE) $(DEP_CPP_W_J1_) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_jn.c +DEP_CPP_W_JN_=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_jn.obj" : $(SOURCE) $(DEP_CPP_W_JN_) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_lgamma.c +DEP_CPP_W_LGA=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_lgamma.obj" : $(SOURCE) $(DEP_CPP_W_LGA) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_lgamma_r.c +DEP_CPP_W_LGAM=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_lgamma_r.obj" : $(SOURCE) $(DEP_CPP_W_LGAM) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_log.c +DEP_CPP_W_LOG=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_log.obj" : $(SOURCE) $(DEP_CPP_W_LOG) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_log10.c +DEP_CPP_W_LOG1=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_log10.obj" : $(SOURCE) $(DEP_CPP_W_LOG1) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_pow.c +DEP_CPP_W_POW=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_pow.obj" : $(SOURCE) $(DEP_CPP_W_POW) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_remainder.c +DEP_CPP_W_REM=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_remainder.obj" : $(SOURCE) $(DEP_CPP_W_REM) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_scalb.c +DEP_CPP_W_SCA=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_scalb.obj" : $(SOURCE) $(DEP_CPP_W_SCA) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\w_sinh.c +DEP_CPP_W_SIN=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\w_sinh.obj" : $(SOURCE) $(DEP_CPP_W_SIN) "$(INTDIR)" + + +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\e_acos.c +DEP_CPP_E_ACOS=\ + ".\fdlibm.h"\ + + +"$(INTDIR)\e_acos.obj" : $(SOURCE) $(DEP_CPP_E_ACOS) "$(INTDIR)" + + +# End Source File +# End Target +# End Project +################################################################################ vendor/spidermonkey/fdlibm/fdlibm.mak @@ -305,3 +305,4 @@ MSG_DEF(JSMSG_NULL_OR_UNDEFINED, 222, 2, JSEXN_TYPEERR, "{0} is {1}") MSG_DEF(JSMSG_LET_DECL_NOT_IN_BLOCK, 223, 0, JSEXN_SYNTAXERR, "let declaration not directly within block") MSG_DEF(JSMSG_BAD_OBJECT_INIT, 224, 0, JSEXN_SYNTAXERR, "invalid object initializer") MSG_DEF(JSMSG_CANT_SET_ARRAY_ATTRS, 225, 0, JSEXN_INTERNALERR, "can't set attributes on indexed array properties") +MSG_DEF(JSMSG_EVAL_ARITY, 226, 0, JSEXN_TYPEERR, "eval accepts only one parameter") vendor/spidermonkey/js.msg @@ -1173,7 +1173,7 @@ JS_ToggleOptions(JSContext *cx, uint32 options) JS_PUBLIC_API(const char *) JS_GetImplementationVersion(void) { - return "JavaScript-C 1.8.0 pre-release 1 2007-10-03"; + return "JavaScript-C 1.8.0 pre-release 1 2009-02-16"; } vendor/spidermonkey/jsapi.c @@ -116,11 +116,8 @@ JS_STATIC_ASSERT(sizeof(JSScopeProperty) > 4 * sizeof(jsval)); -static JSBool -MakeArraySlow(JSContext *cx, JSObject *obj); - #define ENSURE_SLOW_ARRAY(cx, obj) \ - (OBJ_GET_CLASS(cx, obj) == &js_SlowArrayClass || MakeArraySlow(cx, obj)) + (OBJ_GET_CLASS(cx, obj) == &js_SlowArrayClass || js_MakeArraySlow(cx, obj)) /* * Determine if the id represents an array index or an XML property index. @@ -417,7 +414,7 @@ SetArrayElement(JSContext *cx, JSObject *obj, jsuint index, jsval v) if (OBJ_IS_DENSE_ARRAY(cx, obj)) { if (INDEX_TOO_SPARSE(obj, index)) { - if (!MakeArraySlow(cx, obj)) + if (!js_MakeArraySlow(cx, obj)) return JS_FALSE; } else { @@ -586,7 +583,9 @@ array_length_setter(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } if (OBJ_IS_DENSE_ARRAY(cx, obj)) { - if (ARRAY_DENSE_LENGTH(obj) && !ResizeSlots(cx, obj, oldlen, newlen)) + /* Don't reallocate if we're not actually shrinking our slots. */ + jsuint oldsize = ARRAY_DENSE_LENGTH(obj); + if (oldsize >= newlen && !ResizeSlots(cx, obj, oldsize, newlen)) return JS_FALSE; } else if (oldlen - newlen < (1 << 24)) { do { @@ -646,11 +645,11 @@ array_lookupProperty(JSContext *cx, JSObject *obj, jsid id, JSObject **objp, * We have only indexed properties up to DENSELEN (excepting holes), plus * the length property. For all else, we delegate to the prototype. */ - if ((!js_IdIsIndex(id, &i) && - id != ATOM_TO_JSID(cx->runtime->atomState.lengthAtom)) || - obj->fslots[JSSLOT_ARRAY_LENGTH] == 0 || - i >= ARRAY_DENSE_LENGTH(obj) || - obj->dslots[i] == JSVAL_HOLE) + if (id != ATOM_TO_JSID(cx->runtime->atomState.lengthAtom) && + (!js_IdIsIndex(id, &i) || + obj->fslots[JSSLOT_ARRAY_LENGTH] == 0 || + i >= ARRAY_DENSE_LENGTH(obj) || + obj->dslots[i] == JSVAL_HOLE)) { JSObject *proto = STOBJ_GET_PROTO(obj); @@ -701,13 +700,29 @@ array_getProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp) if (!js_IdIsIndex(ID_TO_VALUE(id), &i) || i >= ARRAY_DENSE_LENGTH(obj) || obj->dslots[i] == JSVAL_HOLE) { + JSObject *obj2; + JSProperty *prop; + JSScopeProperty *sprop; + JSObject *proto = STOBJ_GET_PROTO(obj); if (!proto) { *vp = JSVAL_VOID; return JS_TRUE; } - return OBJ_GET_PROPERTY(cx, proto, id, vp); + *vp = JSVAL_VOID; + if (js_LookupPropertyWithFlags(cx, proto, id, 0, &obj2, &prop) < 0) + return JS_FALSE; + + if (prop && OBJ_IS_NATIVE(obj2)) { + sprop = (JSScopeProperty *) prop; + if (!js_NativeGet(cx, obj, obj2, sprop, vp)) + return JS_FALSE; + } + + if (prop) + OBJ_DROP_PROPERTY(cx, obj2, prop); + return JS_TRUE; } *vp = obj->dslots[i]; @@ -763,7 +778,7 @@ array_setProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp) return js_SetProperty(cx, obj, id, vp); if (!js_IdIsIndex(id, &i) || INDEX_TOO_SPARSE(obj, i)) { - if (!MakeArraySlow(cx, obj)) + if (!js_MakeArraySlow(cx, obj)) return JS_FALSE; return js_SetProperty(cx, obj, id, vp); } @@ -1109,8 +1124,8 @@ JSClass js_SlowArrayClass = { /* * Convert an array object from fast-and-dense to slow-and-flexible. */ -static JSBool -MakeArraySlow(JSContext *cx, JSObject *obj) +JSBool +js_MakeArraySlow(JSContext *cx, JSObject *obj) { JSObjectMap *map, *oldmap; uint32 i, length; @@ -2048,7 +2063,7 @@ array_push(JSContext *cx, uintN argc, jsval *vp) length = obj->fslots[JSSLOT_ARRAY_LENGTH]; if (INDEX_TOO_SPARSE(obj, length)) { - if (!MakeArraySlow(cx, obj)) + if (!js_MakeArraySlow(cx, obj)) return JS_FALSE; return array_push_slowly(cx, obj, argc, vp); } @@ -2074,23 +2089,16 @@ array_pop(JSContext *cx, uintN argc, jsval *vp) if (!obj) return JS_FALSE; if (OBJ_IS_DENSE_ARRAY(cx, obj)) { - *vp = JSVAL_VOID; index = obj->fslots[JSSLOT_ARRAY_LENGTH]; - if (index == 0) + if (index == 0) { + *vp = JSVAL_VOID; return JS_TRUE; - index--; - if (index < ARRAY_DENSE_LENGTH(obj)) { - *vp = obj->dslots[index]; - JS_ASSERT(*vp != JSVAL_HOLE); - if (index == 0) { - JS_free(cx, obj->dslots - 1); - obj->dslots = NULL; - } else { - ARRAY_SET_DENSE_LENGTH(obj, index); - } - obj->fslots[JSSLOT_ARRAY_COUNT]--; } - + index--; + if (!GetArrayElement(cx, obj, index, &hole, vp)) + return JS_FALSE; + if (!hole && !DeleteArrayElement(cx, obj, index)) + return JS_FALSE; obj->fslots[JSSLOT_ARRAY_LENGTH] = index; return JS_TRUE; } vendor/spidermonkey/jsarray.c @@ -70,6 +70,9 @@ js_NewArrayObject(JSContext *cx, jsuint length, jsval *vector); extern JSObject * js_NewSlowArrayObject(JSContext *cx); +extern JSBool +js_MakeArraySlow(JSContext *cx, JSObject *obj); + #define JSSLOT_ARRAY_LENGTH JSSLOT_PRIVATE #define JSSLOT_ARRAY_COUNT (JSSLOT_ARRAY_LENGTH + 1) #define JSSLOT_ARRAY_LOOKUP_HOLDER (JSSLOT_ARRAY_COUNT + 1) vendor/spidermonkey/jsarray.h @@ -183,7 +183,20 @@ int main(int argc, char **argv) printf("/* AUTOMATICALLY GENERATED - DO NOT EDIT */\n\n"); #ifdef CROSS_COMPILE -#if defined(IS_LITTLE_ENDIAN) +#if defined(__APPLE__) + /* + * Darwin NSPR uses the same MDCPUCFG (_darwin.cfg) for multiple + * processors, and determines which processor to configure for based + * on compiler predefined macros. We do the same thing here. + */ + printf("#ifdef __LITTLE_ENDIAN__\n"); + printf("#define IS_LITTLE_ENDIAN 1\n"); + printf("#undef IS_BIG_ENDIAN\n"); + printf("#else\n"); + printf("#undef IS_LITTLE_ENDIAN\n"); + printf("#define IS_BIG_ENDIAN 1\n"); + printf("#endif\n\n"); +#elif defined(IS_LITTLE_ENDIAN) printf("#define IS_LITTLE_ENDIAN 1\n"); printf("#undef IS_BIG_ENDIAN\n\n"); #elif defined(IS_BIG_ENDIAN) vendor/spidermonkey/jscpucfg.c @@ -478,12 +478,15 @@ msFromTime(jsdouble t) * We use the first reseved slot to store UTC time, and the second for caching * the local time. The initial value of the cache entry is NaN. */ -#define UTC_TIME_SLOT 0 -#define LOCAL_TIME_SLOT 1 +#define JSSLOT_UTC_TIME JSSLOT_PRIVATE +#define JSSLOT_LOCAL_TIME (JSSLOT_PRIVATE + 1) + +#define DATE_RESERVED_SLOTS 2 JSClass js_DateClass = { js_Date_str, - JSCLASS_HAS_RESERVED_SLOTS(2) | JSCLASS_HAS_CACHED_PROTO(JSProto_Date), + JSCLASS_HAS_RESERVED_SLOTS(DATE_RESERVED_SLOTS) | + JSCLASS_HAS_CACHED_PROTO(JSProto_Date), JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub, JSCLASS_NO_OPTIONAL_MEMBERS @@ -926,14 +929,9 @@ date_now(JSContext *cx, uintN argc, jsval *vp) static JSBool GetUTCTime(JSContext *cx, JSObject *obj, jsval *vp, jsdouble *dp) { - jsval v; - - if (vp && !JS_InstanceOf(cx, obj, &js_DateClass, vp + 2)) - return JS_FALSE; - if (!JS_GetReservedSlot(cx, obj, UTC_TIME_SLOT, &v)) + if (!JS_InstanceOf(cx, obj, &js_DateClass, vp ? vp + 2 : NULL)) return JS_FALSE; - - *dp = *JSVAL_TO_DOUBLE(v); + *dp = *JSVAL_TO_DOUBLE(obj->fslots[JSSLOT_UTC_TIME]); return JS_TRUE; } @@ -948,14 +946,12 @@ SetUTCTimePtr(JSContext *cx, JSObject *obj, jsval *vp, jsdouble *dp) { if (vp && !JS_InstanceOf(cx, obj, &js_DateClass, vp + 2)) return JS_FALSE; + JS_ASSERT_IF(!vp, STOBJ_GET_CLASS(obj) == &js_DateClass); /* Invalidate local time cache. */ - if (!JS_SetReservedSlot(cx, obj, LOCAL_TIME_SLOT, - DOUBLE_TO_JSVAL(cx->runtime->jsNaN))) { - return JS_FALSE; - } - - return JS_SetReservedSlot(cx, obj, UTC_TIME_SLOT, DOUBLE_TO_JSVAL(dp)); + obj->fslots[JSSLOT_LOCAL_TIME] = DOUBLE_TO_JSVAL(cx->runtime->jsNaN); + obj->fslots[JSSLOT_UTC_TIME] = DOUBLE_TO_JSVAL(dp); + return JS_TRUE; } /* @@ -981,8 +977,9 @@ GetAndCacheLocalTime(JSContext *cx, JSObject *obj, jsval *vp, jsdouble *dp) jsdouble result; jsdouble *cached; - if (!obj || !JS_GetReservedSlot(cx, obj, LOCAL_TIME_SLOT, &v)) + if (!obj || !JS_InstanceOf(cx, obj, &js_DateClass, vp ? vp + 2 : NULL)) return JS_FALSE; + v = obj->fslots[JSSLOT_LOCAL_TIME]; result = *JSVAL_TO_DOUBLE(v); @@ -998,10 +995,7 @@ GetAndCacheLocalTime(JSContext *cx, JSObject *obj, jsval *vp, jsdouble *dp) if (!cached) return JS_FALSE; - if (!JS_SetReservedSlot(cx, obj, LOCAL_TIME_SLOT, - DOUBLE_TO_JSVAL(cached))) { - return JS_FALSE; - } + obj->fslots[JSSLOT_LOCAL_TIME] = DOUBLE_TO_JSVAL(cached); } *dp = result; @@ -2028,10 +2022,8 @@ date_constructor(JSContext *cx, JSObject* obj) if (!date) return NULL; - JS_SetReservedSlot(cx, obj, UTC_TIME_SLOT, - DOUBLE_TO_JSVAL(date)); - JS_SetReservedSlot(cx, obj, LOCAL_TIME_SLOT, - DOUBLE_TO_JSVAL(cx->runtime->jsNaN)); + obj->fslots[JSSLOT_UTC_TIME] = DOUBLE_TO_JSVAL(date); + obj->fslots[JSSLOT_LOCAL_TIME] = DOUBLE_TO_JSVAL(cx->runtime->jsNaN); return date; } vendor/spidermonkey/jsdate.c @@ -732,10 +732,13 @@ JS_SetWatchPoint(JSContext *cx, JSObject *obj, jsval idval, return JS_FALSE; } - if (JSVAL_IS_INT(idval)) + if (JSVAL_IS_INT(idval)) { propid = INT_JSVAL_TO_JSID(idval); - else if (!js_ValueToStringId(cx, idval, &propid)) - return JS_FALSE; + } else { + if (!js_ValueToStringId(cx, idval, &propid)) + return JS_FALSE; + CHECK_FOR_STRING_INDEX(propid); + } if (!js_LookupProperty(cx, obj, propid, &pobj, &prop)) return JS_FALSE; vendor/spidermonkey/jsdbgapi.c @@ -3020,8 +3020,16 @@ js_GC(JSContext *cx, JSGCInvocationKind gckind) ok = callback(cx, JSGC_BEGIN); if (gckind & GC_LOCK_HELD) JS_LOCK_GC(rt); - if (!ok && gckind != GC_LAST_CONTEXT) + if (!ok && gckind != GC_LAST_CONTEXT) { + /* + * It's possible that we've looped back to this code from the 'goto + * restart_at_beginning' below in the GC_SET_SLOT_REQUEST code and + * that rt->gcLevel is now 0. Don't return without notifying! + */ + if (rt->gcLevel == 0 && (gckind & GC_LOCK_HELD)) + JS_NOTIFY_GC_DONE(rt); return; + } } /* Lock out other GC allocator and collector invocations. */ @@ -3471,7 +3479,7 @@ js_GC(JSContext *cx, JSGCInvocationKind gckind) goto restart; } - if (!(rt->shapeGen & SHAPE_OVERFLOW_BIT)) { + if (rt->shapeGen < SHAPE_OVERFLOW_BIT - 1) { js_EnablePropertyCache(cx); #ifdef JS_THREADSAFE iter = NULL; vendor/spidermonkey/jsgc.c @@ -80,17 +80,22 @@ #ifdef js_invoke_c__ uint32 -js_GenerateShape(JSContext *cx, JSBool gcLocked) +js_GenerateShape(JSContext *cx, JSBool gcLocked, JSScopeProperty *sprop) { JSRuntime *rt; uint32 shape; + JSTempValueRooter tvr; rt = cx->runtime; shape = JS_ATOMIC_INCREMENT(&rt->shapeGen); JS_ASSERT(shape != 0); if (shape & SHAPE_OVERFLOW_BIT) { rt->gcPoke = JS_TRUE; + if (sprop) + JS_PUSH_TEMP_ROOT_SPROP(cx, sprop, &tvr); js_GC(cx, gcLocked ? GC_LOCK_HELD : GC_NORMAL); + if (sprop) + JS_POP_TEMP_ROOT(cx, &tvr); shape = JS_ATOMIC_INCREMENT(&rt->shapeGen); JS_ASSERT(shape != 0); JS_ASSERT_IF(shape & SHAPE_OVERFLOW_BIT, @@ -825,8 +830,10 @@ ComputeThis(JSContext *cx, JSBool lazy, jsval *argv) thisp = JSVAL_TO_OBJECT(argv[-1]); } else { thisp = JSVAL_TO_OBJECT(argv[-1]); - if (OBJ_GET_CLASS(cx, thisp) == &js_CallClass) + if (OBJ_GET_CLASS(cx, thisp) == &js_CallClass || + OBJ_GET_CLASS(cx, thisp) == &js_BlockClass) { return js_ComputeGlobalThis(cx, lazy, argv); + } if (thisp->map->ops->thisObject) { /* Some objects (e.g., With) delegate 'this' to another object. */ @@ -1473,12 +1480,6 @@ js_Execute(JSContext *cx, JSObject *chain, JSScript *script, frame.callee = NULL; frame.fun = NULL; frame.thisp = chain; - OBJ_TO_OUTER_OBJECT(cx, frame.thisp); - if (!frame.thisp) { - ok = JS_FALSE; - goto out; - } - flags |= JSFRAME_COMPUTED_THIS; frame.argc = 0; frame.argv = NULL; frame.nvars = script->ngvars; @@ -1528,6 +1529,15 @@ js_Execute(JSContext *cx, JSObject *chain, JSScript *script, } cx->fp = &frame; + if (!down) { + OBJ_TO_OUTER_OBJECT(cx, frame.thisp); + if (!frame.thisp) { + ok = JS_FALSE; + goto out2; + } + frame.flags |= JSFRAME_COMPUTED_THIS; + } + if (hook) { hookData = hook(cx, &frame, JS_TRUE, 0, cx->debugHooks->executeHookData); @@ -1541,6 +1551,8 @@ js_Execute(JSContext *cx, JSObject *chain, JSScript *script, if (hook) hook(cx, &frame, JS_FALSE, &ok, hookData); } + +out2: if (mark) js_FreeRawStack(cx, mark); cx->fp = oldfp; @@ -1677,63 +1689,84 @@ js_CheckRedeclaration(JSContext *cx, JSObject *obj, jsid id, uintN attrs, jsval value; const char *type, *name; + /* + * Both objp and propp must be either null or given. When given, *propp + * must be null. This way we avoid an extra "if (propp) *propp = NULL" for + * the common case of a non-existing property. + */ + JS_ASSERT(!objp == !propp); + JS_ASSERT_IF(propp, !*propp); + + /* The JSPROP_INITIALIZER case below may generate a warning. Since we must + * drop the property before reporting it, we insists on !propp to avoid + * looking up the property again after the reporting is done. + */ + JS_ASSERT_IF(attrs & JSPROP_INITIALIZER, attrs == JSPROP_INITIALIZER); + JS_ASSERT_IF(attrs == JSPROP_INITIALIZER, !propp); + if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop)) return JS_FALSE; - if (propp) { - *objp = obj2; - *propp = prop; - } if (!prop) return JS_TRUE; - /* - * Use prop as a speedup hint to OBJ_GET_ATTRIBUTES, but drop it on error. - * An assertion at label bad: will insist that it is null. - */ + /* Use prop as a speedup hint to OBJ_GET_ATTRIBUTES. */ if (!OBJ_GET_ATTRIBUTES(cx, obj2, id, prop, &oldAttrs)) { OBJ_DROP_PROPERTY(cx, obj2, prop); -#ifdef DEBUG - prop = NULL; -#endif - goto bad; + return JS_FALSE; } /* - * From here, return true, or else goto bad on failure to null out params. * If our caller doesn't want prop, drop it (we don't need it any longer). */ if (!propp) { OBJ_DROP_PROPERTY(cx, obj2, prop); prop = NULL; + } else { + *objp = obj2; + *propp = prop; } if (attrs == JSPROP_INITIALIZER) { /* Allow the new object to override properties. */ if (obj2 != obj) return JS_TRUE; + + /* The property must be dropped already. */ + JS_ASSERT(!prop); report = JSREPORT_WARNING | JSREPORT_STRICT; } else { /* We allow redeclaring some non-readonly properties. */ if (((oldAttrs | attrs) & JSPROP_READONLY) == 0) { - /* - * Allow redeclaration of variables and functions, but insist that - * the new value is not a getter if the old value was, ditto for - * setters -- unless prop is impermanent (in which case anyone - * could delete it and redefine it, willy-nilly). - */ + /* Allow redeclaration of variables and functions. */ if (!(attrs & (JSPROP_GETTER | JSPROP_SETTER))) return JS_TRUE; + + /* + * Allow adding a getter only if a property already has a setter + * but no getter and similarly for adding a setter. That is, we + * allow only the following transitions: + * + * no-property --> getter --> getter + setter + * no-property --> setter --> getter + setter + */ if ((~(oldAttrs ^ attrs) & (JSPROP_GETTER | JSPROP_SETTER)) == 0) return JS_TRUE; + + /* + * Allow redeclaration of an impermanent property (in which case + * anyone could delete it and redefine it, willy-nilly). + */ if (!(oldAttrs & JSPROP_PERMANENT)) return JS_TRUE; } + if (prop) + OBJ_DROP_PROPERTY(cx, obj2, prop); report = JSREPORT_ERROR; isFunction = (oldAttrs & (JSPROP_GETTER | JSPROP_SETTER)) != 0; if (!isFunction) { if (!OBJ_GET_PROPERTY(cx, obj, id, &value)) - goto bad; + return JS_FALSE; isFunction = VALUE_IS_FUNCTION(cx, value); } } @@ -1751,19 +1784,11 @@ js_CheckRedeclaration(JSContext *cx, JSObject *obj, jsid id, uintN attrs, : js_var_str; name = js_ValueToPrintableString(cx, ID_TO_VALUE(id)); if (!name) - goto bad; + return JS_FALSE; return JS_ReportErrorFlagsAndNumber(cx, report, js_GetErrorMessage, NULL, JSMSG_REDECLARED_VAR, type, name); - -bad: - if (propp) { - *objp = NULL; - *propp = NULL; - } - JS_ASSERT(!prop); - return JS_FALSE; } JSBool @@ -4743,16 +4768,6 @@ interrupt: newifp->frame.regs = NULL; newifp->frame.spbase = NULL; - /* Call the debugger hook if present. */ - hook = cx->debugHooks->callHook; - if (hook) { - newifp->hookData = hook(cx, &newifp->frame, JS_TRUE, 0, - cx->debugHooks->callHookData); - LOAD_INTERRUPT_HANDLER(cx); - } else { - newifp->hookData = NULL; - } - /* Scope with a call object parented by callee's parent. */ if (JSFUN_HEAVYWEIGHT_TEST(fun->flags) && !js_GetCallObject(cx, &newifp->frame, parent)) { @@ -4775,6 +4790,16 @@ interrupt: newifp->frame.regs = &regs; cx->fp = fp = &newifp->frame; + /* Call the debugger hook if present. */ + hook = cx->debugHooks->callHook; + if (hook) { + newifp->hookData = hook(cx, &newifp->frame, JS_TRUE, 0, + cx->debugHooks->callHookData); + LOAD_INTERRUPT_HANDLER(cx); + } else { + newifp->hookData = NULL; + } + inlineCallCount++; JS_RUNTIME_METER(rt, inlineCalls); @@ -5093,7 +5118,7 @@ interrupt: funobj = fp->callee; slot += JSCLASS_RESERVED_SLOTS(&js_FunctionClass); if (!JS_GetReservedSlot(cx, funobj, slot, &rval)) - return JS_FALSE; + goto error; if (JSVAL_IS_VOID(rval)) rval = JSVAL_NULL; } else { @@ -5151,7 +5176,7 @@ interrupt: /* Store the regexp object value in its cloneIndex slot. */ if (fp->fun) { if (!JS_SetReservedSlot(cx, funobj, slot, rval)) - return JS_FALSE; + goto error; } else { fp->vars[slot] = rval; } @@ -5524,6 +5549,7 @@ interrupt: /* Lookup id in order to check for redeclaration problems. */ id = ATOM_TO_JSID(atom); + prop = NULL; if (!js_CheckRedeclaration(cx, obj, id, attrs, &obj2, &prop)) goto error; @@ -5545,11 +5571,11 @@ interrupt: * by the JSOP_*GVAR opcodes. */ if (index < script->ngvars && - (attrs & JSPROP_PERMANENT) && obj2 == obj && OBJ_IS_NATIVE(obj)) { sprop = (JSScopeProperty *) prop; - if (SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj)) && + if ((sprop->attrs & JSPROP_PERMANENT) && + SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj)) && SPROP_HAS_STUB_GETTER(sprop) && SPROP_HAS_STUB_SETTER(sprop)) { /* vendor/spidermonkey/jsinterp.c @@ -162,8 +162,12 @@ typedef struct JSInlineFrame { #define SHAPE_OVERFLOW_BIT JS_BIT(32 - PCVCAP_TAGBITS) +/* + * When sprop is not null and the shape generation triggers the GC due to a + * shape overflow, the functions roots sprop. + */ extern uint32 -js_GenerateShape(JSContext *cx, JSBool gcLocked); +js_GenerateShape(JSContext *cx, JSBool gcLocked, JSScopeProperty *sprop); struct JSPropCacheEntry { jsbytecode *kpc; /* pc if vcap tag is <= 1, else atom */ vendor/spidermonkey/jsinterp.h @@ -556,8 +556,7 @@ js_InitMathClass(JSContext *cx, JSObject *obj) { JSObject *Math; - Math = JS_DefineObject(cx, obj, js_Math_str, &js_MathClass, NULL, - JSPROP_READONLY | JSPROP_PERMANENT); + Math = JS_DefineObject(cx, obj, js_Math_str, &js_MathClass, NULL, 0); if (!Math) return NULL; if (!JS_DefineFunctions(cx, Math, math_static_methods)) vendor/spidermonkey/jsmath.c @@ -309,7 +309,7 @@ num_toLocaleString(JSContext *cx, uintN argc, jsval *vp) JSString *numStr, *str; const char *num, *end, *tmpSrc; char *buf, *tmpDest; - const char *dec; + const char *nint; int digits, size, remainder, nrepeat; /* @@ -324,17 +324,28 @@ num_toLocaleString(JSContext *cx, uintN argc, jsval *vp) if (!num) return JS_FALSE; - /* Find bit before the decimal. */ - dec = strchr(num, '.'); - digits = dec ? dec - num : (int)strlen(num); + /* + * Find the first non-integer value, whether it be a letter as in + * 'Infinite', a decimal point, or an 'e' from exponential notation. + */ + nint = num; + if (*nint == '-') + nint++; + while (*nint >= '0' && *nint <= '9') + nint++; + digits = nint - num; end = num + digits; + if (!digits) + return JS_TRUE; rt = cx->runtime; thousandsLength = strlen(rt->thousandsSeparator); decimalLength = strlen(rt->decimalSeparator); /* Figure out how long resulting string will be. */ - size = digits + (dec ? decimalLength + strlen(dec + 1) : 0); + size = digits + (*nint ? strlen(nint + 1) + 1 : 0); + if (*nint == '.') + size += decimalLength; numGrouping = tmpGroup = rt->numGrouping; remainder = digits; @@ -376,12 +387,12 @@ num_toLocaleString(JSContext *cx, uintN argc, jsval *vp) tmpGroup--; } - if (dec) { + if (*nint == '.') { strcpy(tmpDest, rt->decimalSeparator); tmpDest += decimalLength; - strcpy(tmpDest, dec + 1); + strcpy(tmpDest, nint + 1); } else { - *tmpDest++ = '\0'; + strcpy(tmpDest, nint); } if (cx->localeCallbacks && cx->localeCallbacks->localeToUnicode) vendor/spidermonkey/jsnum.c @@ -299,8 +299,13 @@ js_SetProtoOrParent(JSContext *cx, JSObject *obj, uint32 slot, JSObject *pobj) JS_LOCK_GC(rt); ssr.next = rt->setSlotRequests; rt->setSlotRequests = &ssr; - js_GC(cx, GC_SET_SLOT_REQUEST); - JS_UNLOCK_GC(rt); + for (;;) { + js_GC(cx, GC_SET_SLOT_REQUEST); + JS_UNLOCK_GC(rt); + if (!rt->setSlotRequests) + break; + JS_LOCK_GC(rt); + } if (ssr.errnum != JSMSG_NOT_AN_ERROR) { if (ssr.errnum == JSMSG_OUT_OF_MEMORY) { @@ -1140,8 +1145,10 @@ js_ComputeFilename(JSContext *cx, JSStackFrame *caller, { uint32 flags; + JS_ASSERT(principals || !cx->runtime->findObjectPrincipals); flags = JS_GetScriptFilenameFlags(caller->script); if ((flags & JSFILENAME_PROTECTED) && + principals && strcmp(principals->codebase, "[System Principal]")) { *linenop = 0; return principals->codebase; @@ -1214,13 +1221,16 @@ obj_eval(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) return JS_FALSE; /* - * Script.prototype.compile/exec and Object.prototype.eval all take an - * optional trailing argument that overrides the scope object. + * Script.prototype.compile/exec and Object.prototype.eval no longer take + * an optional trailing argument. */ if (argc >= 2) { - if (!js_ValueToObject(cx, argv[1], &scopeobj)) + if (!JS_ReportErrorFlagsAndNumber(cx, + JSREPORT_WARNING | JSREPORT_STRICT, + js_GetErrorMessage, NULL, + JSMSG_EVAL_ARITY)) { return JS_FALSE; - argv[1] = OBJECT_TO_JSVAL(scopeobj); + } } /* From here on, control must exit through label out with ok set. */ @@ -1242,7 +1252,7 @@ obj_eval(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) } if (obj != callerScopeChain) { ok = js_CheckPrincipalsAccess(cx, obj, - caller->script->principals, + JS_StackFramePrincipals(cx, caller), cx->runtime->atomState.evalAtom); if (!ok) goto out; @@ -1432,6 +1442,9 @@ obj_watch(JSContext *cx, uintN argc, jsval *vp) if (attrs & JSPROP_READONLY) return JS_TRUE; *vp = JSVAL_VOID; + + if (OBJ_IS_DENSE_ARRAY(cx, obj) && !js_MakeArraySlow(cx, obj)) + return JS_FALSE; return JS_SetWatchPoint(cx, obj, userid, obj_watch_handler, callable); } @@ -3341,7 +3354,8 @@ js_LookupPropertyWithFlags(JSContext *cx, JSObject *obj, jsid id, uintN flags, /* Resolved: juggle locks and lookup id again. */ if (obj2 != obj) { JS_UNLOCK_OBJ(cx, obj); - JS_LOCK_OBJ(cx, obj2); + if (OBJ_IS_NATIVE(obj2)) + JS_LOCK_OBJ(cx, obj2); } protoIndex = 0; for (proto = start; proto && proto != obj2; @@ -3352,7 +3366,6 @@ js_LookupPropertyWithFlags(JSContext *cx, JSObject *obj, jsid id, uintN flags, if (!MAP_IS_NATIVE(&scope->map)) { /* Whoops, newresolve handed back a foreign obj2. */ JS_ASSERT(obj2 != obj); - JS_UNLOCK_OBJ(cx, obj2); ok = OBJ_LOOKUP_PROPERTY(cx, obj2, id, objp, propp); if (!ok || *propp) goto cleanup; @@ -3373,7 +3386,8 @@ js_LookupPropertyWithFlags(JSContext *cx, JSObject *obj, jsid id, uintN flags, JS_ASSERT(obj2 == scope->object); obj = obj2; } else if (obj2 != obj) { - JS_UNLOCK_OBJ(cx, obj2); + if (OBJ_IS_NATIVE(obj2)) + JS_UNLOCK_OBJ(cx, obj2); JS_LOCK_OBJ(cx, obj); } } @@ -4359,8 +4373,10 @@ js_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode, /* Avoid diverging for non-natives that reuse js_CheckAccess. */ if (pobj->map->ops->checkAccess == js_CheckAccess) { - if (!writing) + if (!writing) { *vp = JSVAL_VOID; + *attrsp = 0; + } break; } return OBJ_CHECK_ACCESS(cx, pobj, id, mode, vp, attrsp); vendor/spidermonkey/jsobj.c @@ -4824,7 +4824,7 @@ js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v, for (fp = cx->fp; fp && !fp->script; fp = fp->down) continue; - if (!fp || !fp->regs) + if (!fp || !fp->regs || !fp->regs->sp) goto do_fallback; script = fp->script; vendor/spidermonkey/jsopcode.c @@ -2029,6 +2029,16 @@ CheckDestructuring(JSContext *cx, BindData *data, return JS_FALSE; } +#if JS_HAS_DESTRUCTURING_SHORTHAND + if (right && + right->pn_arity == PN_LIST && + (right->pn_extra & PNX_SHORTHAND)) { + js_ReportCompileErrorNumber(cx, TS(tc->parseContext), right, + JSREPORT_ERROR, JSMSG_BAD_OBJECT_INIT); + return JS_FALSE; + } +#endif + fpvd.table.ops = NULL; lhs = left->pn_head; if (lhs && lhs->pn_type == TOK_DEFSHARP) { @@ -4555,18 +4565,32 @@ MemberExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc, pn2->pn_pos.begin = pn->pn_pos.begin; pn2->pn_pos.end = CURRENT_TOKEN(ts).pos.end; - /* Optimize o['p'] to o.p by rewriting pn2. */ - if (pn3->pn_type == TOK_STRING) { - pn2->pn_type = TOK_DOT; - pn2->pn_op = JSOP_GETPROP; - pn2->pn_arity = PN_NAME; - pn2->pn_expr = pn; - pn2->pn_atom = pn3->pn_atom; - } else { + /* + * Optimize o['p'] to o.p by rewriting pn2, but avoid rewriting + * o['0'] to use JSOP_GETPROP, to keep fast indexing disjoint in + * the interpreter from fast property access. However, if the + * bracketed string is a uint32, we rewrite pn3 to be a number + * instead of a string. + */ + do { + if (pn3->pn_type == TOK_STRING) { + jsuint index; + + if (!js_IdIsIndex(ATOM_TO_JSID(pn3->pn_atom), &index)) { + pn2->pn_type = TOK_DOT; + pn2->pn_op = JSOP_GETPROP; + pn2->pn_arity = PN_NAME; + pn2->pn_expr = pn; + pn2->pn_atom = pn3->pn_atom; + break; + } + pn3->pn_type = TOK_NUMBER; + pn3->pn_dval = index; + } pn2->pn_op = JSOP_GETELEM; pn2->pn_left = pn; pn2->pn_right = pn3; - } + } while (0); } else if (allowCallSyntax && tt == TOK_LP) { pn2 = NewParseNode(cx, ts, PN_LIST, tc); if (!pn2) vendor/spidermonkey/jsparse.c @@ -3622,12 +3622,17 @@ regexp_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) if (!JSVAL_IS_INT(id)) return JS_TRUE; + while (OBJ_GET_CLASS(cx, obj) != &js_RegExpClass) { + obj = OBJ_GET_PROTO(cx, obj); + if (!obj) + return JS_TRUE; + } slot = JSVAL_TO_INT(id); if (slot == REGEXP_LAST_INDEX) return JS_GetReservedSlot(cx, obj, 0, vp); JS_LOCK_OBJ(cx, obj); - re = (JSRegExp *) JS_GetInstancePrivate(cx, obj, &js_RegExpClass, NULL); + re = (JSRegExp *) JS_GetPrivate(cx, obj); if (re) { switch (slot) { case REGEXP_SOURCE: @@ -3661,6 +3666,11 @@ regexp_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) ok = JS_TRUE; if (!JSVAL_IS_INT(id)) return ok; + while (OBJ_GET_CLASS(cx, obj) != &js_RegExpClass) { + obj = OBJ_GET_PROTO(cx, obj); + if (!obj) + return JS_TRUE; + } slot = JSVAL_TO_INT(id); if (slot == REGEXP_LAST_INDEX) { if (!JS_ValueToNumber(cx, *vp, &lastIndex)) @@ -4298,10 +4308,12 @@ js_NewRegExpObject(JSContext *cx, JSTokenStream *ts, str = js_NewStringCopyN(cx, chars, length); if (!str) return NULL; + JS_PUSH_TEMP_ROOT_STRING(cx, str, &tvr); re = js_NewRegExp(cx, ts, str, flags, JS_FALSE); - if (!re) + if (!re) { + JS_POP_TEMP_ROOT(cx, &tvr); return NULL; - JS_PUSH_TEMP_ROOT_STRING(cx, str, &tvr); + } obj = js_NewObject(cx, &js_RegExpClass, NULL, NULL, 0); if (!obj || !JS_SetPrivate(cx, obj, re)) { js_DestroyRegExp(cx, re); vendor/spidermonkey/jsregexp.c @@ -298,150 +298,144 @@ GetChar(JSTokenStream *ts) if (ts->ungetpos != 0) { c = ts->ungetbuf[--ts->ungetpos]; } else { - do { - if (ts->linebuf.ptr == ts->linebuf.limit) { - len = PTRDIFF(ts->userbuf.limit, ts->userbuf.ptr, jschar); + if (ts->linebuf.ptr == ts->linebuf.limit) { + len = PTRDIFF(ts->userbuf.limit, ts->userbuf.ptr, jschar); + if (len <= 0) { + if (!ts->file) { + ts->flags |= TSF_EOF; + return EOF; + } + + /* Fill ts->userbuf so that \r and \r\n convert to \n. */ + crflag = (ts->flags & TSF_CRFLAG) != 0; + len = js_fgets(cbuf, JS_LINE_LIMIT - crflag, ts->file); if (len <= 0) { - if (!ts->file) { - ts->flags |= TSF_EOF; - return EOF; - } - - /* Fill ts->userbuf so that \r and \r\n convert to \n. */ - crflag = (ts->flags & TSF_CRFLAG) != 0; - len = js_fgets(cbuf, JS_LINE_LIMIT - crflag, ts->file); - if (len <= 0) { - ts->flags |= TSF_EOF; - return EOF; - } - olen = len; - ubuf = ts->userbuf.base; - i = 0; - if (crflag) { - ts->flags &= ~TSF_CRFLAG; - if (cbuf[0] != '\n') { - ubuf[i++] = '\n'; - len++; - ts->linepos--; - } - } - for (j = 0; i < len; i++, j++) - ubuf[i] = (jschar) (unsigned char) cbuf[j]; - ts->userbuf.limit = ubuf + len; - ts->userbuf.ptr = ubuf; + ts->flags |= TSF_EOF; + return EOF; } - if (ts->listener) { - ts->listener(ts->filename, ts->lineno, ts->userbuf.ptr, len, - &ts->listenerTSData, ts->listenerData); + olen = len; + ubuf = ts->userbuf.base; + i = 0; + if (crflag) { + ts->flags &= ~TSF_CRFLAG; + if (cbuf[0] != '\n') { + ubuf[i++] = '\n'; + len++; + ts->linepos--; + } } - - nl = ts->saveEOL; - if (!nl) { + for (j = 0; i < len; i++, j++) + ubuf[i] = (jschar) (unsigned char) cbuf[j]; + ts->userbuf.limit = ubuf + len; + ts->userbuf.ptr = ubuf; + } + if (ts->listener) { + ts->listener(ts->filename, ts->lineno, ts->userbuf.ptr, len, + &ts->listenerTSData, ts->listenerData); + } + + nl = ts->saveEOL; + if (!nl) { + /* + * Any one of \n, \r, or \r\n ends a line (the longest + * match wins). Also allow the Unicode line and paragraph + * separators. + */ + for (nl = ts->userbuf.ptr; nl < ts->userbuf.limit; nl++) { /* - * Any one of \n, \r, or \r\n ends a line (the longest - * match wins). Also allow the Unicode line and paragraph - * separators. + * Try to prevent value-testing on most characters by + * filtering out characters that aren't 000x or 202x. */ - for (nl = ts->userbuf.ptr; nl < ts->userbuf.limit; nl++) { - /* - * Try to prevent value-testing on most characters by - * filtering out characters that aren't 000x or 202x. - */ - if ((*nl & 0xDFD0) == 0) { - if (*nl == '\n') - break; - if (*nl == '\r') { - if (nl + 1 < ts->userbuf.limit && nl[1] == '\n') - nl++; - break; - } - if (*nl == LINE_SEPARATOR || *nl == PARA_SEPARATOR) - break; + if ((*nl & 0xDFD0) == 0) { + if (*nl == '\n') + break; + if (*nl == '\r') { + if (nl + 1 < ts->userbuf.limit && nl[1] == '\n') + nl++; + break; } + if (*nl == LINE_SEPARATOR || *nl == PARA_SEPARATOR) + break; } } - - /* - * If there was a line terminator, copy thru it into linebuf. - * Else copy JS_LINE_LIMIT-1 bytes into linebuf. - */ - if (nl < ts->userbuf.limit) - len = PTRDIFF(nl, ts->userbuf.ptr, jschar) + 1; - if (len >= JS_LINE_LIMIT) { - len = JS_LINE_LIMIT - 1; - ts->saveEOL = nl; - } else { - ts->saveEOL = NULL; - } - js_strncpy(ts->linebuf.base, ts->userbuf.ptr, len); - ts->userbuf.ptr += len; - olen = len; - - /* - * Make sure linebuf contains \n for EOL (don't do this in - * userbuf because the user's string might be readonly). - */ - if (nl < ts->userbuf.limit) { - if (*nl == '\r') { - if (ts->linebuf.base[len-1] == '\r') { - /* - * Does the line segment end in \r? We must check - * for a \n at the front of the next segment before - * storing a \n into linebuf. This case matters - * only when we're reading from a file. - */ - if (nl + 1 == ts->userbuf.limit && ts->file) { - len--; - ts->flags |= TSF_CRFLAG; /* clear NLFLAG? */ - if (len == 0) { - /* - * This can happen when a segment ends in - * \r\r. Start over. ptr == limit in this - * case, so we'll fall into buffer-filling - * code. - */ - return GetChar(ts); - } - } else { - ts->linebuf.base[len-1] = '\n'; - } - } - } else if (*nl == '\n') { - if (nl > ts->userbuf.base && - nl[-1] == '\r' && - ts->linebuf.base[len-2] == '\r') { + } + + /* + * If there was a line terminator, copy thru it into linebuf. + * Else copy JS_LINE_LIMIT-1 bytes into linebuf. + */ + if (nl < ts->userbuf.limit) + len = PTRDIFF(nl, ts->userbuf.ptr, jschar) + 1; + if (len >= JS_LINE_LIMIT) { + len = JS_LINE_LIMIT - 1; + ts->saveEOL = nl; + } else { + ts->saveEOL = NULL; + } + js_strncpy(ts->linebuf.base, ts->userbuf.ptr, len); + ts->userbuf.ptr += len; + olen = len; + + /* + * Make sure linebuf contains \n for EOL (don't do this in + * userbuf because the user's string might be readonly). + */ + if (nl < ts->userbuf.limit) { + if (*nl == '\r') { + if (ts->linebuf.base[len-1] == '\r') { + /* + * Does the line segment end in \r? We must check + * for a \n at the front of the next segment before + * storing a \n into linebuf. This case matters + * only when we're reading from a file. + */ + if (nl + 1 == ts->userbuf.limit && ts->file) { len--; - JS_ASSERT(ts->linebuf.base[len] == '\n'); + ts->flags |= TSF_CRFLAG; /* clear NLFLAG? */ + if (len == 0) { + /* + * This can happen when a segment ends in + * \r\r. Start over. ptr == limit in this + * case, so we'll fall into buffer-filling + * code. + */ + return GetChar(ts); + } + } else { ts->linebuf.base[len-1] = '\n'; } - } else if (*nl == LINE_SEPARATOR || *nl == PARA_SEPARATOR) { + } + } else if (*nl == '\n') { + if (nl > ts->userbuf.base && + nl[-1] == '\r' && + ts->linebuf.base[len-2] == '\r') { + len--; + JS_ASSERT(ts->linebuf.base[len] == '\n'); ts->linebuf.base[len-1] = '\n'; } + } else if (*nl == LINE_SEPARATOR || *nl == PARA_SEPARATOR) { + ts->linebuf.base[len-1] = '\n'; } - - /* Reset linebuf based on adjusted segment length. */ - ts->linebuf.limit = ts->linebuf.base + len; - ts->linebuf.ptr = ts->linebuf.base; - - /* Update position of linebuf within physical userbuf line. */ - if (!(ts->flags & TSF_NLFLAG)) - ts->linepos += ts->linelen; - else - ts->linepos = 0; - if (ts->linebuf.limit[-1] == '\n') - ts->flags |= TSF_NLFLAG; - else - ts->flags &= ~TSF_NLFLAG; - - /* Update linelen from original segment length. */ - ts->linelen = olen; } - c = *ts->linebuf.ptr++; - /* - * In the hopes of being liberal in what we accept, we toss out little- - * and big-endian byte order markers here, see bug 368516. - */ - } while (c == 0xfffe || c == 0xfeff); + + /* Reset linebuf based on adjusted segment length. */ + ts->linebuf.limit = ts->linebuf.base + len; + ts->linebuf.ptr = ts->linebuf.base; + + /* Update position of linebuf within physical userbuf line. */ + if (!(ts->flags & TSF_NLFLAG)) + ts->linepos += ts->linelen; + else + ts->linepos = 0; + if (ts->linebuf.limit[-1] == '\n') + ts->flags |= TSF_NLFLAG; + else + ts->flags &= ~TSF_NLFLAG; + + /* Update linelen from original segment length. */ + ts->linelen = olen; + } + c = *ts->linebuf.ptr++; } if (c == '\n') ts->lineno++; @@ -819,6 +813,8 @@ GetXMLEntity(JSContext *cx, JSTokenStream *ts) /* Put the entity, including the '&' already scanned, in ts->tokenbuf. */ offset = PTRDIFF(ts->tokenbuf.ptr, ts->tokenbuf.base, jschar); FastAppendChar(&ts->tokenbuf, '&'); + if (!STRING_BUFFER_OK(&ts->tokenbuf)) + return JS_FALSE; while ((c = GetChar(ts)) != ';') { if (c == EOF || c == '\n') { js_ReportCompileErrorNumber(cx, ts, NULL, JSREPORT_ERROR, @@ -826,6 +822,8 @@ GetXMLEntity(JSContext *cx, JSTokenStream *ts) return JS_FALSE; } FastAppendChar(&ts->tokenbuf, (jschar) c); + if (!STRING_BUFFER_OK(&ts->tokenbuf)) + return JS_FALSE; } /* Let length be the number of jschars after the '&', including the ';'. */ @@ -911,6 +909,8 @@ badncr: msg = JSMSG_BAD_XML_NCR; bad: /* No match: throw a TypeError per ECMA-357 10.3.2.1 step 8(a). */ + JS_ASSERT(STRING_BUFFER_OK(&ts->tokenbuf)); + JS_ASSERT(PTRDIFF(ts->tokenbuf.ptr, bp, jschar) >= 1); bytes = js_DeflateString(cx, bp + 1, PTRDIFF(ts->tokenbuf.ptr, bp, jschar) - 1); if (bytes) { @@ -990,6 +990,15 @@ NewToken(JSTokenStream *ts, ptrdiff_t adjust) return tp; } +static JS_INLINE JSBool +ScanAsSpace(jschar c) +{ + /* Treat little- and big-endian BOMs as whitespace for compatibility. */ + if (JS_ISSPACE(c) || c == 0xfffe || c == 0xfeff) + return JS_TRUE; + return JS_FALSE; +} + JSTokenType js_GetToken(JSContext *cx, JSTokenStream *ts) { @@ -1200,7 +1209,7 @@ retry: if (ts->flags & TSF_NEWLINES) break; } - } while (JS_ISSPACE(c)); + } while (ScanAsSpace(c)); tp = NewToken(ts, -1); if (c == EOF) { @@ -1722,7 +1731,7 @@ retry: cp[3] == 'n' && cp[4] == 'e') { SkipChars(ts, 5); - while ((c = GetChar(ts)) != '\n' && JS_ISSPACE(c)) + while ((c = GetChar(ts)) != '\n' && ScanAsSpace(c)) continue; if (JS7_ISDEC(c)) { line = JS7_UNDEC(c); @@ -1734,7 +1743,7 @@ retry: } line = temp; } - while (c != '\n' && JS_ISSPACE(c)) + while (c != '\n' && ScanAsSpace(c)) c = GetChar(ts); i = 0; if (c == '"') { @@ -1749,7 +1758,7 @@ retry: } if (c == '"') { while ((c = GetChar(ts)) != '\n' && - JS_ISSPACE(c)) { + ScanAsSpace(c)) { continue; } } vendor/spidermonkey/jsscan.c @@ -809,6 +809,7 @@ GetPropertyTreeChild(JSContext *cx, JSScopeProperty *parent, JSScopeProperty *sprop; PropTreeKidsChunk *chunk; uintN i, n; + uint32 shape; rt = cx->runtime; if (!parent) { @@ -895,6 +896,12 @@ GetPropertyTreeChild(JSContext *cx, JSScopeProperty *parent, } locked_not_found: + /* + * Call js_GenerateShape before the allocation to prevent collecting the + * new property when the shape generation triggers the GC. + */ + shape = js_GenerateShape(cx, JS_TRUE, NULL); + sprop = NewScopeProperty(rt); if (!sprop) goto out_of_memory; @@ -907,7 +914,7 @@ locked_not_found: sprop->flags = child->flags; sprop->shortid = child->shortid; sprop->parent = sprop->kids = NULL; - sprop->shape = js_GenerateShape(cx, JS_TRUE); + sprop->shape = shape; if (!parent) { entry->child = sprop; @@ -1256,9 +1263,11 @@ js_AddScopeProperty(JSContext *cx, JSScope *scope, jsid id, */ if (!JS_CLIST_IS_EMPTY(&cx->runtime->watchPointList) && js_FindWatchPoint(cx->runtime, scope, id)) { - JS_PUSH_TEMP_ROOT_SPROP(cx, overwriting, &tvr); + if (overwriting) + JS_PUSH_TEMP_ROOT_SPROP(cx, overwriting, &tvr); setter = js_WrapWatchedSetter(cx, id, attrs, setter); - JS_POP_TEMP_ROOT(cx, &tvr); + if (overwriting) + JS_POP_TEMP_ROOT(cx, &tvr); if (!setter) goto fail_overwrite; } vendor/spidermonkey/jsscope.c @@ -220,7 +220,7 @@ JS_STATIC_ASSERT(offsetof(JSScope, title) == sizeof(JSObjectMap)); #define OBJ_SCOPE(obj) ((JSScope *)(obj)->map) #define SCOPE_MAKE_UNIQUE_SHAPE(cx,scope) \ - ((scope)->shape = js_GenerateShape((cx), JS_FALSE)) + ((scope)->shape = js_GenerateShape((cx), JS_FALSE, NULL)) #define SCOPE_EXTEND_SHAPE(cx,scope,sprop) \ JS_BEGIN_MACRO \ @@ -228,7 +228,7 @@ JS_STATIC_ASSERT(offsetof(JSScope, title) == sizeof(JSObjectMap)); (scope)->shape == (scope)->lastProp->shape) { \ (scope)->shape = (sprop)->shape; \ } else { \ - (scope)->shape = js_GenerateShape((cx), JS_FALSE); \ + (scope)->shape = js_GenerateShape((cx), JS_FALSE, sprop); \ } \ JS_END_MACRO vendor/spidermonkey/jsscope.h @@ -1216,9 +1216,7 @@ match_or_replace(JSContext *cx, /* Assume a full array result is required, then prove otherwise. */ test = JS_FALSE; - if (fp) { - JS_ASSERT(*fp->regs->pc == JSOP_CALL || - *fp->regs->pc == JSOP_NEW); + if (fp && (*fp->regs->pc == JSOP_CALL || *fp->regs->pc == JSOP_NEW)) { JS_ASSERT(js_CodeSpec[*fp->regs->pc].length == 3); switch (fp->regs->pc[3]) { case JSOP_POP: @@ -1949,6 +1947,9 @@ str_concat(JSContext *cx, uintN argc, jsval *vp) NORMALIZE_THIS(cx, vp, str); + /* Set vp (aka rval) early to handle the argc == 0 case. */ + *vp = STRING_TO_JSVAL(str); + for (i = 0, argv = vp + 2; i < argc; i++) { str2 = js_ValueToString(cx, argv[i]); if (!str2) @@ -1958,9 +1959,9 @@ str_concat(JSContext *cx, uintN argc, jsval *vp) str = js_ConcatStrings(cx, str, str2); if (!str) return JS_FALSE; + *vp = STRING_TO_JSVAL(str); } - *vp = STRING_TO_JSVAL(str); return JS_TRUE; } vendor/spidermonkey/jsstr.c @@ -728,7 +728,8 @@ js_IsXMLName(JSContext *cx, jsval v) } static JSBool -Namespace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +NamespaceHelper(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, + jsval *rval) { jsval urival, prefixval; JSObject *uriobj; @@ -750,7 +751,7 @@ Namespace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) else uriobj = NULL; #endif - if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) { + if (!obj) { /* Namespace called as function. */ if (argc == 1 && isNamespace) { /* Namespace called with one Namespace argument is identity. */ @@ -837,22 +838,32 @@ Namespace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) } static JSBool -QName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +Namespace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + return NamespaceHelper(cx, + (cx->fp->flags & JSFRAME_CONSTRUCTING) ? obj : NULL, + argc, argv, rval); +} + +static JSBool +QNameHelper(JSContext *cx, JSObject *obj, JSClass *clasp, uintN argc, + jsval *argv, jsval *rval) { jsval nameval, nsval; JSBool isQName, isNamespace; JSXMLQName *qn; JSString *uri, *prefix, *name; JSObject *nsobj; - JSClass *clasp; JSXMLNamespace *ns; + JS_ASSERT(clasp == &js_QNameClass.base || + clasp == &js_AttributeNameClass); nameval = argv[argc > 1]; isQName = !JSVAL_IS_PRIMITIVE(nameval) && OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(nameval)) == &js_QNameClass.base; - if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) { + if (!obj) { /* QName called as function. */ if (argc == 1 && isQName) { /* QName called with one QName argument is identity. */ @@ -861,13 +872,10 @@ QName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) } /* - * Create and return a new QName object exactly as if constructed. - * Use the constructor's clasp so we can be shared by AttributeName - * (see below after this function). + * Create and return a new QName or AttributeName object exactly as if + * constructed. */ - obj = js_NewObject(cx, - JS_ValueToFunction(cx, argv[-2])->u.n.clasp, - NULL, NULL, 0); + obj = js_NewObject(cx, clasp, NULL, NULL, 0); if (!obj) return JS_FALSE; *rval = OBJECT_TO_JSVAL(obj); @@ -962,14 +970,18 @@ out: } static JSBool +QName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + return QNameHelper(cx, (cx->fp->flags & JSFRAME_CONSTRUCTING) ? obj : NULL, + &js_QNameClass.base, argc, argv, rval); +} + +static JSBool AttributeName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { - /* - * Since js_AttributeNameClass was initialized, obj will have that as its - * class, not js_QNameClass. - */ - return QName(cx, obj, argc, argv, rval); + return QNameHelper(cx, (cx->fp->flags & JSFRAME_CONSTRUCTING) ? obj : NULL, + &js_AttributeNameClass, argc, argv, rval); } /* @@ -1963,6 +1975,7 @@ ParseXMLSource(JSContext *cx, JSString *src) { jsval nsval; JSXMLNamespace *ns; + JSString *uri; size_t urilen, srclen, length, offset, dstlen; jschar *chars; const jschar *srcp, *endp; @@ -1976,8 +1989,8 @@ ParseXMLSource(JSContext *cx, JSString *src) JSXMLArray nsarray; uintN flags; - static const char prefix[] = "<parent xmlns='"; - static const char middle[] = "'>"; + static const char prefix[] = "<parent xmlns=\""; + static const char middle[] = "\">"; static const char suffix[] = "</parent>"; #define constrlen(constr) (sizeof(constr) - 1) @@ -1985,8 +1998,9 @@ ParseXMLSource(JSContext *cx, JSString *src) if (!js_GetDefaultXMLNamespace(cx, &nsval)) return NULL; ns = (JSXMLNamespace *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(nsval)); + uri = js_EscapeAttributeValue(cx, ns->uri, JS_FALSE); - urilen = JSSTRING_LENGTH(ns->uri); + urilen = JSSTRING_LENGTH(uri); srclen = JSSTRING_LENGTH(src); length = constrlen(prefix) + urilen + constrlen(middle) + srclen + constrlen(suffix); @@ -1998,7 +2012,7 @@ ParseXMLSource(JSContext *cx, JSString *src) dstlen = length; js_InflateStringToBuffer(cx, prefix, constrlen(prefix), chars, &dstlen); offset = dstlen; - js_strncpy(chars + offset, JSSTRING_CHARS(ns->uri), urilen); + js_strncpy(chars + offset, JSSTRING_CHARS(uri), urilen); offset += urilen; dstlen = length - offset + 1; js_InflateStringToBuffer(cx, middle, constrlen(middle), chars + offset, @@ -5587,21 +5601,6 @@ JS_FRIEND_DATA(JSClass) js_XMLClass = { NULL, NULL, JS_CLASS_TRACE(xml_trace), NULL }; -static JSObject * -CallConstructorFunction(JSContext *cx, JSObject *obj, JSClass *clasp, - uintN argc, jsval *argv) -{ - JSObject *tmp; - jsval rval; - - while ((tmp = OBJ_GET_PARENT(cx, obj)) != NULL) - obj = tmp; - if (!JS_CallFunctionName(cx, obj, clasp->name, argc, argv, &rval)) - return NULL; - JS_ASSERT(!JSVAL_IS_PRIMITIVE(rval)); - return JSVAL_TO_OBJECT(rval); -} - static JSXML * StartNonListXMLMethod(JSContext *cx, jsval *vp, JSObject **objp) { @@ -5652,26 +5651,25 @@ StartNonListXMLMethod(JSContext *cx, jsval *vp, JSObject **objp) static JSBool xml_addNamespace(JSContext *cx, uintN argc, jsval *vp) { - JSObject *nsobj; JSXMLNamespace *ns; NON_LIST_XML_METHOD_PROLOG; if (xml->xml_class != JSXML_CLASS_ELEMENT) - return JS_TRUE; + goto done; xml = CHECK_COPY_ON_WRITE(cx, xml, obj); if (!xml) return JS_FALSE; - nsobj = CallConstructorFunction(cx, obj, &js_NamespaceClass.base, 1, - vp + 2); - if (!nsobj) + if (!NamespaceHelper(cx, NULL, 1, vp + 2, vp)) return JS_FALSE; - vp[2] = OBJECT_TO_JSVAL(nsobj); - - ns = (JSXMLNamespace *) JS_GetPrivate(cx, nsobj); + JS_ASSERT(!JSVAL_IS_PRIMITIVE(*vp)); + + ns = (JSXMLNamespace *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(*vp)); if (!AddInScopeNamespace(cx, xml, ns)) return JS_FALSE; ns->declared = JS_TRUE; + + done: *vp = OBJECT_TO_JSVAL(obj); return JS_TRUE; } @@ -6791,40 +6789,39 @@ xml_removeNamespace_helper(JSContext *cx, JSXML *xml, JSXMLNamespace *ns) static JSBool xml_removeNamespace(JSContext *cx, uintN argc, jsval *vp) { - JSObject *nsobj; JSXMLNamespace *ns; NON_LIST_XML_METHOD_PROLOG; - *vp = OBJECT_TO_JSVAL(obj); if (xml->xml_class != JSXML_CLASS_ELEMENT) - return JS_TRUE; + goto done; xml = CHECK_COPY_ON_WRITE(cx, xml, obj); if (!xml) return JS_FALSE; - nsobj = CallConstructorFunction(cx, obj, &js_NamespaceClass.base, 1, vp + 2); - if (!nsobj) + if (!NamespaceHelper(cx, NULL, 1, vp + 2, vp)) return JS_FALSE; - vp[2] = OBJECT_TO_JSVAL(nsobj); - ns = (JSXMLNamespace *) JS_GetPrivate(cx, nsobj); + JS_ASSERT(!JSVAL_IS_PRIMITIVE(*vp)); + ns = (JSXMLNamespace *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(*vp)); /* NOTE: remove ns from each ancestor if not used by that ancestor. */ - return xml_removeNamespace_helper(cx, xml, ns); + if (!xml_removeNamespace_helper(cx, xml, ns)) + return JS_FALSE; + done: + *vp = OBJECT_TO_JSVAL(obj); + return JS_TRUE; } static JSBool xml_replace(JSContext *cx, uintN argc, jsval *vp) { - jsval name, value; + jsval value; JSXML *vxml, *kid; - uint32 index, matchIndex; - JSObject *nameobj; + uint32 index, i; JSXMLQName *nameqn; NON_LIST_XML_METHOD_PROLOG; - *vp = OBJECT_TO_JSVAL(obj); if (xml->xml_class != JSXML_CLASS_ELEMENT) - return JS_TRUE; + goto done; value = vp[3]; vxml = VALUE_IS_XML(cx, value) @@ -6845,30 +6842,38 @@ xml_replace(JSContext *cx, uintN argc, jsval *vp) if (!xml) return JS_FALSE; - name = vp[2]; - if (js_IdIsIndex(name, &index)) - return Replace(cx, xml, index, value); - - /* Call function QName per spec, not ToXMLName, to avoid attribute names. */ - nameobj = CallConstructorFunction(cx, obj, &js_QNameClass.base, 1, &name); - if (!nameobj) - return JS_FALSE; - vp[2] = OBJECT_TO_JSVAL(nameobj); - nameqn = (JSXMLQName *) JS_GetPrivate(cx, nameobj); - - index = xml->xml_kids.length; - matchIndex = XML_NOT_FOUND; - while (index != 0) { - --index; - kid = XMLARRAY_MEMBER(&xml->xml_kids, index, JSXML); - if (kid && MatchElemName(nameqn, kid)) { - if (matchIndex != XML_NOT_FOUND) - DeleteByIndex(cx, xml, matchIndex); - matchIndex = index; + if (!js_IdIsIndex(vp[2], &index)) { + /* + * Call function QName per spec, not ToXMLName, to avoid attribute + * names. + */ + if (!QNameHelper(cx, NULL, &js_QNameClass.base, 1, vp + 2, vp)) + return JS_FALSE; + JS_ASSERT(!JSVAL_IS_PRIMITIVE(*vp)); + nameqn = (JSXMLQName *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(*vp)); + + i = xml->xml_kids.length; + index = XML_NOT_FOUND; + while (i != 0) { + --i; + kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML); + if (kid && MatchElemName(nameqn, kid)) { + if (i != XML_NOT_FOUND) + DeleteByIndex(cx, xml, i); + index = i; + } } + + if (index == XML_NOT_FOUND) + goto done; } - return matchIndex == XML_NOT_FOUND || Replace(cx, xml, matchIndex, value); + if (!Replace(cx, xml, index, value)) + return JS_FALSE; + + done: + *vp = OBJECT_TO_JSVAL(obj); + return JS_TRUE; } static JSBool vendor/spidermonkey/jsxml.c vendor/spidermonkey/CVS/Entries vendor/spidermonkey/CVS/Repository vendor/spidermonkey/CVS/Root vendor/spidermonkey/config/CVS/Entries vendor/spidermonkey/config/CVS/Repository vendor/spidermonkey/config/CVS/Root vendor/spidermonkey/config/FreeBSD.mk vendor/spidermonkey/editline/CVS/Entries vendor/spidermonkey/editline/CVS/Repository vendor/spidermonkey/editline/CVS/Root vendor/spidermonkey/fdlibm/CVS/Entries vendor/spidermonkey/fdlibm/CVS/Repository vendor/spidermonkey/fdlibm/CVS/Root vendor/spidermonkey/js.mak 42d2e468f462b0e6f9470afd6772da240eb07db3 John Barnette jbarnette@gmail.com http://github.com/jbarnette/johnson/commit/7346114ff2fe4e3169a8ff17c017409ae552b66d 7346114ff2fe4e3169a8ff17c017409ae552b66d 2009-03-26T17:39:11-07:00 2009-03-26T17:39:11-07:00 Update vendored SpiderMonkey. Updated to JavaScript-C 1.8.0 pre-release 1 2009-02-16, which is several years more recent than the last 1.8 drop we were using. 62d8ce7caf1e5f3c127aa63fb6b67b394bef0486 John Barnette jbarnette@gmail.com