=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/poly.c,v retrieving revision 1.3 retrieving revision 1.7 diff -u -p -r1.3 -r1.7 --- OpenXM_contrib2/asir2000/builtin/poly.c 2000/01/11 06:43:35 1.3 +++ OpenXM_contrib2/asir2000/builtin/poly.c 2001/03/14 06:04:52 1.7 @@ -1,4 +1,52 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/builtin/poly.c,v 1.2 1999/12/27 04:16:30 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, + * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. + * + * $OpenXM: OpenXM_contrib2/asir2000/builtin/poly.c,v 1.6 2001/03/13 01:10:24 noro Exp $ +*/ #include "ca.h" #include "parse.h" #include "base.h" @@ -15,6 +63,7 @@ void Pp_mag(),Pmaxblen(); void Pmergelist(), Pch_mv(), Pre_mv(), Pdeglist(); void Pptomp(),Pmptop(); void Pptolmp(),Plmptop(); +void Psfptop(); void Pptogf2n(),Pgf2ntop(),Pgf2ntovect(); void Pptogfpn(),Pgfpntop(); void Pfind_root_gf2n(); @@ -95,6 +144,8 @@ struct ftab poly_tab[] = { {"ptolmp",Pptolmp,1}, {"lmptop",Plmptop,1}, + {"sfptop",Psfptop,1}, + {"ptogf2n",Pptogf2n,1}, {"gf2ntop",Pgf2ntop,-2}, {"gf2ntovect",Pgf2ntovect,1}, @@ -615,16 +666,25 @@ Q *rp; STOQ(ret,*rp); } +extern P current_gfs_ext; +extern int current_gfs_p; +extern int current_gfs_q; +extern int current_gfs_q1; +extern int *current_gfs_plus1; +extern int *current_gfs_ntoi; +extern int *current_gfs_iton; + void Psetmod_ff(arg,rp) NODE arg; Obj *rp; { int ac; + int d; Obj mod,defpoly; N n; UP up; UP2 up2; - Q q; + Q q,r; P p; NODE n0,n1; LIST list; @@ -637,7 +697,8 @@ Obj *rp; switch ( OID(mod) ) { case O_N: current_ff = FF_GFP; - setmod_lm(NM((Q)mod)); break; + setmod_lm(NM((Q)mod)); + break; case O_P: current_ff = FF_GF2N; setmod_gf2n((P)mod); break; @@ -645,13 +706,19 @@ Obj *rp; error("setmod_ff : invalid argument"); } } else if ( ac == 2 ) { - current_ff = FF_GFPN; - defpoly = (Obj)ARG0(arg); - mod = (Obj)ARG1(arg); - if ( !mod || !defpoly ) - error("setmod_ff : invalid argument"); - setmod_lm(NM((Q)mod)); - setmod_gfpn((P)defpoly); + if ( OID(ARG0(arg)) == O_N ) { + /* small finite field; primitive root representation */ + current_ff = FF_GFS; + setmod_sf(QTOS((Q)ARG0(arg)),QTOS((Q)ARG1(arg))); + } else { + mod = (Obj)ARG1(arg); + current_ff = FF_GFPN; + defpoly = (Obj)ARG0(arg); + if ( !mod || !defpoly ) + error("setmod_ff : invalid argument"); + setmod_lm(NM((Q)mod)); + setmod_gfpn((P)defpoly); + } } switch ( current_ff ) { case FF_GFP: @@ -664,6 +731,18 @@ Obj *rp; MKNODE(n1,q,0); MKNODE(n0,p,n1); MKLIST(list,n0); *rp = (Obj)list; break; + case FF_GFS: + STOQ(current_gfs_p,q); + if ( current_gfs_ext ) { + enc_to_p(current_gfs_p,current_gfs_iton[1], + VR(current_gfs_ext),&p); + n0 = mknode(3,q,current_gfs_ext,p); + } else { + STOQ(current_gfs_iton[1],r); + n0 = mknode(3,q,current_gfs_ext,r); + } + MKLIST(list,n0); + *rp = (Obj)list; break; default: *rp = 0; break; } @@ -752,6 +831,7 @@ Obj *rp; LM l; GF2N g; GFPN p; + GFS s; switch ( current_ff ) { case FF_GFP: @@ -760,6 +840,8 @@ Obj *rp; randomgf2n(&g); *rp = (Obj)g; break; case FF_GFPN: randomgfpn(&p); *rp = (Obj)p; break; + case FF_GFS: + randomgfs(&s); *rp = (Obj)s; break; default: error("random_ff : current_ff is not set"); } @@ -785,6 +867,7 @@ Obj *rp; DCP dc,dcr0,dcr; GF2N rg,sg; GFPN rpn,spn; + GFS rs; P t; Obj obj; @@ -802,6 +885,10 @@ Obj *rp; case FF_GFPN: ntogfpn((Obj)p,&rpn); simpgfpn((GFPN)rpn,&spn); *rp = (Obj)spn; break; + case FF_GFS: + ptomp(current_gfs_q,(P)p,&t); mqtogfs(t,&rs); + *rp = (Obj)rs; + break; default: *rp = (Obj)p; break; @@ -1013,6 +1100,13 @@ NODE arg; P *rp; { lmptop((P)ARG0(arg),rp); +} + +void Psfptop(arg,rp) +NODE arg; +P *rp; +{ + sfptop((P)ARG0(arg),rp); } void Pptogf2n(arg,rp)