Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp. lisp/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * cl-extra.el (ceiling*, floor*, round*, truncate*): Implement these in terms of the C functions; mark them as obsolete. (mod*, rem*): Use #'nth-value with the C functions, not #'nth with the CL emulation functions. man/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * lispref/numbers.texi (Bigfloat Basics): Correct this documentation (ignoring for the moment that it breaks off in mid-sentence). tests/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: Test the new Common Lisp-compatible rounding functions available in C. (generate-rounding-output): Provide a function useful for generating the data for the rounding functions tests. src/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * floatfns.c (ROUNDING_CONVERT, CONVERT_WITH_NUMBER_TYPES) (CONVERT_WITHOUT_NUMBER_TYPES, MAYBE_TWO_ARGS_BIGNUM) (MAYBE_ONE_ARG_BIGNUM, MAYBE_TWO_ARGS_RATIO) (MAYBE_ONE_ARG_RATIO, MAYBE_TWO_ARGS_BIGFLOAT) (MAYBE_ONE_ARG_BIGFLOAT, MAYBE_EFF, MAYBE_CHAR_OR_MARKER): New macros, used in the implementation of the rounding functions. (ceiling_two_fixnum, ceiling_two_bignum, ceiling_two_ratio) (ceiling_two_bigfloat, ceiling_one_ratio, ceiling_one_bigfloat) (ceiling_two_float, ceiling_one_float, ceiling_one_mundane_arg) (floor_two_fixnum, floor_two_bignum, floor_two_ratio) (floor_two_bigfloat, floor_one_ratio, floor_one_bigfloat) (floor_two_float, floor_one_mundane_arg, round_two_fixnum) (round_two_bignum_1, round_two_bignum, round_two_ratio) (round_one_bigfloat_1, round_two_bigfloat, round_one_ratio) (round_one_bigfloat, round_two_float, round_one_float) (round_one_mundane_arg, truncate_two_fixnum) (truncate_two_bignum, truncate_two_ratio, truncate_two_bigfloat) (truncate_one_ratio, truncate_one_bigfloat, truncate_two_float) (truncate_one_float, truncate_one_mundane_arg): New functions, used in the implementation of the rounding functions. (Fceiling, Ffloor, Fround, Ftruncate, Ffceiling, Fffloor) (Ffround, Fftruncate): Revise to fully support Common Lisp conventions. This means: -- All functions have optional DIVISOR arguments -- All functions return multiple values; see #'values -- All functions do their arithmetic with the correct number types according to the contamination rules. -- #'round and #'fround always round towards the even number in ambiguous cases. * doprnt.c (emacs_doprnt_1): * number.c (internal_coerce_number): Call Ftruncate with two arguments, not one. * floatfns.c (Ffloat): Correct this, if NUMBER is a bignum. * lisp.h: Declare Ftruncate as taking two arguments. * number.c: Provide scratch_ratio2, init it appropriately. * number.h: Make scratch_ratio2 available. * number.h (BIGFLOAT_ARITH_RETURN): * number.h (BIGFLOAT_ARITH_RETURN1): Correct these functions.

/*
 * Copyright (c) 2000, Red Hat, Inc.
 *
 *     This program is free software; you can redistribute it and/or modify
 *     it under the terms of the GNU General Public License as published by
 *     the Free Software Foundation; either version 2 of the License, or
 *     (at your option) any later version.
 *
 *     A copy of the GNU General Public License can be found at
 *     http://www.gnu.org/
 *
 * Written by DJ Delorie <dj@cygnus.com>
 *
 */

#include "win32.h"

typedef struct {
  char *name;
  HINSTANCE handle;
} DllInfo;

#define DLL(n) static DllInfo n ## _info __asm__ (#n "_info") = { #n, 0}

#define Auto(dll, func, size) \
	__asm__ ("\t.data"); \
	__asm__ ("\t.global\t_" #func "@" #size); \
	__asm__ ("_" #func "@" #size ":"); \
	__asm__ ("\tcall\tautoload_common"); \
	__asm__ ("\t.long\t" #dll "_info"); \
	__asm__ ("\t.ascii\t\"" #func "\\0\"")

DLL (wininet);

Auto (wininet, InternetAttemptConnect, 4);
Auto (wininet, InternetCloseHandle, 4);
Auto (wininet, InternetGetLastResponseInfoA, 12);
Auto (wininet, InternetOpenA, 20);
Auto (wininet, InternetOpenUrlA, 24);
Auto (wininet, InternetReadFile, 16);
Auto (wininet, InternetSetOptionA, 16);
Auto (wininet, InternetQueryOptionA, 16);
Auto (wininet, HttpQueryInfoA, 20);
Auto (wininet, HttpSendRequestA, 20);

typedef struct {
  DllInfo *dll;
  char name[100];
} AutoEntry;

static void autoload_common () __asm__ ("autoload_common");

static void
autoload_common (int x)
{
  int fp, rel;
  unsigned char *proc;
  HINSTANCE h;
  AutoEntry *a;
  
  a = *(AutoEntry **)(&x - 1);
  if (a->dll->handle == 0)
    {
      h = LoadLibrary (a->dll->name);
      a->dll->handle = h;
    }
  fp = (int) GetProcAddress (a->dll->handle, a->name);
  proc = ((unsigned char *)a) - 5;
  rel = fp - (int)(a); /* now it's a relative call */
  *proc++ = 0xe9; /* jump near 32-bit relative */
  *proc++ = rel;
  *proc++ = rel>>8;
  *proc++ = rel>>16;
  *proc++ = rel>>24;

  *(int *)(&x-1) = (int)proc-5;
}