 Timestamp:
 Dec 22, 2011, 10:17:58 PM (7 years ago)
 Location:
 release/1.7/source
 Files:

 5 edited
Legend:
 Unmodified
 Added
 Removed

release/1.7/source
 Property svn:mergeinfo changed
/trunk/source merged: 1514915151
 Property svn:mergeinfo changed

release/1.7/source/compiler/ARM/arm2.lisp
r14847 r15154 3808 3808 (^))) 3809 3809 3810 (defun arm2naturalconstant (seg vreg xfer value) 3811 (arm2useoperator 3812 (if (typep value *nxtargetfixnumtype*) 3813 (%nx1operator fixnum) 3814 (%nx1operator immediate)) 3815 seg vreg xfer value)) 3816 3810 3817 3811 3818 … … 8257 8264 (fixy (acodefixnumformp y))) 8258 8265 (if (and fixx fixy) 8259 (arm2 absolutenaturalseg vreg xfer (+ fixx fixy))8266 (arm2naturalconstant seg vreg xfer (+ fixx fixy)) 8260 8267 (let* ((u15x (and (typep fixx '(unsignedbyte 15)) fixx)) 8261 8268 (u15y (and (typep fixy '(unsignedbyte 15)) fixy))) … … 8281 8288 (fixy (acodefixnumformp y))) 8282 8289 (if (and fixx fixy) 8283 (arm2 absolutenaturalseg vreg xfer ( fixx fixy))8290 (arm2naturalconstant seg vreg xfer ( fixx fixy)) 8284 8291 (let* ((u15y (and (typep fixy '(unsignedbyte 15)) fixy))) 8285 8292 (if (not u15y) … … 8304 8311 (naturaly (nxnaturalconstantp y))) 8305 8312 (if (and naturalx naturaly) 8306 (arm2 absolutenaturalseg vreg xfer (logior naturalx naturaly))8313 (arm2naturalconstant seg vreg xfer (logior naturalx naturaly)) 8307 8314 (let* ((constant (let* ((c (or naturalx naturaly))) 8308 8315 (when c … … 8330 8337 (naturaly (nxnaturalconstantp y))) 8331 8338 (if (and naturalx naturaly) 8332 (arm2 absolutenaturalseg vreg xfer (logxor naturalx naturaly))8339 (arm2naturalconstant seg vreg xfer (logxor naturalx naturaly)) 8333 8340 (let* ((constant (let* ((c (or naturalx naturaly))) 8334 8341 (when c … … 8356 8363 (naturaly (nxnaturalconstantp y))) 8357 8364 (if (and naturalx naturaly) 8358 (arm2 absolutenaturalseg vreg xfer (logand naturalx naturaly))8365 (arm2naturalconstant seg vreg xfer (logand naturalx naturaly)) 8359 8366 (let* ((constant (let* ((c (or naturalx naturaly))) 8360 8367 (when c 
release/1.7/source/compiler/PPC/ppc2.lisp
r14775 r15154 3914 3914 (^))) 3915 3915 3916 (defun ppc2naturalconstant (seg vreg xfer value) 3917 (ppc2useoperator 3918 (if (typep value *nxtargetfixnumtype*) 3919 (%nx1operator fixnum) 3920 (%nx1operator immediate)) 3921 seg vreg xfer value)) 3922 3923 3916 3924 3917 3925 … … 8856 8864 (fixy (acodefixnumformp y))) 8857 8865 (if (and fixx fixy) 8858 (ppc2 absolutenaturalseg vreg xfer (+ fixx fixy))8866 (ppc2naturalconstant seg vreg xfer (+ fixx fixy)) 8859 8867 (let* ((u15x (and (typep fixx '(unsignedbyte 15)) fixx)) 8860 8868 (u15y (and (typep fixy '(unsignedbyte 15)) fixy))) … … 8880 8888 (fixy (acodefixnumformp y))) 8881 8889 (if (and fixx fixy) 8882 (ppc2 absolutenaturalseg vreg xfer ( fixx fixy))8890 (ppc2naturalconstant seg vreg xfer ( fixx fixy)) 8883 8891 (let* ((u15y (and (typep fixy '(unsignedbyte 15)) fixy))) 8884 8892 (if (not u15y) … … 8903 8911 (naturaly (nxnaturalconstantp y))) 8904 8912 (if (and naturalx naturaly) 8905 (ppc2 absolutenaturalseg vreg xfer (logior naturalx naturaly))8913 (ppc2naturalconstant seg vreg xfer (logior naturalx naturaly)) 8906 8914 (let* ((u32x (nxu32constantp x)) 8907 8915 (u32y (nxu32constantp y)) … … 8930 8938 (naturaly (nxnaturalconstantp y))) 8931 8939 (if (and naturalx naturaly) 8932 (ppc2 absolutenaturalseg vreg xfer (logxor naturalx naturaly))8940 (ppc2naturalconstant seg vreg xfer (logxor naturalx naturaly)) 8933 8941 (let* ((u32x (nxu32constantp x)) 8934 8942 (u32y (nxu32constantp y)) … … 8957 8965 (naturaly (nxnaturalconstantp y))) 8958 8966 (if (and naturalx naturaly) 8959 (ppc2 absolutenaturalseg vreg xfer (logand naturalx naturaly))8967 (ppc2naturalconstant seg vreg xfer (logand naturalx naturaly)) 8960 8968 (let* ((u32x (nxu32constantp x)) 8961 8969 (u32y (nxu32constantp y)) 
release/1.7/source/compiler/X86/x862.lisp
r14822 r15154 4722 4722 (^))) 4723 4723 4724 (defun x862naturalconstant (seg vreg xfer value) 4725 (x862useoperator 4726 (if (typep value *nxtargetfixnumtype*) 4727 (%nx1operator fixnum) 4728 (%nx1operator immediate)) 4729 seg vreg xfer value)) 4730 4731 4724 4732 4725 4733 … … 9951 9959 (fixy (acodefixnumformp y))) 9952 9960 (if (and fixx fixy) 9953 (x862 absolutenaturalseg vreg xfer (+ fixx fixy))9961 (x862naturalconstant seg vreg xfer (+ fixx fixy)) 9954 9962 (let* ((u31x (and (typep fixx '(unsignedbyte 31)) fixx)) 9955 9963 (u31y (and (typep fixy '(unsignedbyte 31)) fixy))) … … 9976 9984 (fixy (acodefixnumformp y))) 9977 9985 (if (and fixx fixy) 9978 (x862 absolutenaturalseg vreg xfer ( fixx fixy))9986 (x862naturalconstant seg vreg xfer ( fixx fixy)) 9979 9987 (let* ((u31y (and (typep fixy '(unsignedbyte 31)) fixy))) 9980 9988 (if (not u31y) … … 10000 10008 (naturaly (nxnaturalconstantp y))) 10001 10009 (if (and naturalx naturaly) 10002 (x862 absolutenaturalseg vreg xfer (logior naturalx naturaly))10010 (x862naturalconstant seg vreg xfer (logior naturalx naturaly)) 10003 10011 (let* ((u31x (nxu31constantp x)) 10004 10012 (u31y (nxu31constantp y)) … … 10026 10034 (naturaly (nxnaturalconstantp y))) 10027 10035 (if (and naturalx naturaly) 10028 (x862 absolutenaturalseg vreg xfer (logxor naturalx naturaly))10036 (x862naturalconstant seg vreg xfer (logxor naturalx naturaly)) 10029 10037 (let* ((u32x (nxu32constantp x)) 10030 10038 (u32y (nxu32constantp y)) … … 10051 10059 (let* ((naturalx (nxnaturalconstantp x)) 10052 10060 (naturaly (nxnaturalconstantp y))) 10053 (if (and naturalx naturaly) 10054 (x862 absolutenaturalseg vreg xfer (logand naturalx naturaly))10061 (if (and naturalx naturaly) 10062 (x862naturalconstant seg vreg xfer (logand naturalx naturaly)) 10055 10063 (let* ((u31x (nxu31constantp x)) 10056 10064 (u31y (nxu31constantp y)) 
release/1.7/source/level0/l0cfmsupport.lisp
 Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.