Changeset 13305


Ignore:
Timestamp:
Dec 17, 2009, 6:15:40 PM (10 years ago)
Author:
gz
Message:

Merge 32-bit/windows-only changes; update mergeinfo

Location:
branches/working-0711/ccl
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl

  • branches/working-0711/ccl/lisp-kernel/bits.h

    r13277 r13305  
    159159#ifdef PPC
    160160#ifdef PPC64
    161   __asm__  ("cntlzd %0,%1" : "=r" (lz) : "r" (w));
     161  __asm__ __volatile__("cntlzd %0,%1" : "=r" (lz) : "r" (w));
    162162#else
    163   __asm__  ("cntlzw %0,%1" : "=r" (lz) : "r" (w));
     163  __asm__ __volatile__("cntlzw %0,%1" : "=r" (lz) : "r" (w));
    164164#endif
    165165#endif /* PPC */
    166166#ifdef X86
    167167#ifdef X8664
    168   __asm__ ("bsr %1,%0" : "=r" (lz) : "r" (w));
    169   __asm__ ("xor $63,%0" : "=r" (lz));
     168  __asm__ __volatile__("bsr %1,%0" : "=r" (lz) : "r" (w));
     169  __asm__ __volatile__("xor $63,%0" : "=r" (lz));
    170170#else
    171   __asm__ ("bsr %1,%0" : "=r" (lz) : "r" (w));
    172   __asm__ ("xor $31,%0" : "=r" (lz));
     171  __asm__ __volatile__("bsr %1,%0" : "=r" (lz) : "r" (w));
     172  __asm__ __volatile__("xor $31,%0" : "=r" (lz));
    173173#endif
    174174#endif
  • branches/working-0711/ccl/lisp-kernel/x86-spentry32.s

    r12410 r13305  
    29342934        __(movd %mm1,%imm0)
    29352935local_label(opt):
    2936         __(testb %imm0_bh,%imm0_bh)
     2936        __(movb %imm0_bh,%imm0_b)
     2937        __(testb %imm0_b,%imm0_b)
    29372938        __(je local_label(rest_keys))
    29382939        __(btl $initopt_bit,%imm0)
     
    29592960        __(movb $fulltagmask,%imm0_bh)
    29602961        __(andb %arg_reg_b,%imm0_bh)
    2961         __(compare_reg_to_nil(%arg_z))
     2962        __(compare_reg_to_nil(%arg_reg))
    29622963        __(je local_label(default_hard_opt))
    29632964        __(cmpb $fulltag_cons,%imm0_bh)
Note: See TracChangeset for help on using the changeset viewer.