From c8441c7824f0922397522ab135488f5b7277de63 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 19 Jan 2015 08:32:16 +0000 Subject: texk/web2c: Remove intcast(), obsolete for 32/64-bit systems git-svn-id: svn://tug.org/texlive/trunk@36091 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/omegaware/ChangeLog | 9 +++ Build/source/texk/web2c/omegaware/odvicopy.ch | 62 ++--------------- Build/source/texk/web2c/omegaware/odvitype.ch | 99 --------------------------- Build/source/texk/web2c/omegaware/ofm2opl.ch | 6 -- Build/source/texk/web2c/omegaware/opl2ofm.ch | 9 --- Build/source/texk/web2c/omegaware/otangle.ch | 8 --- Build/source/texk/web2c/omegaware/ovf2ovp.ch | 6 -- Build/source/texk/web2c/omegaware/ovp2ovf.ch | 10 --- 8 files changed, 13 insertions(+), 196 deletions(-) (limited to 'Build/source/texk/web2c/omegaware') diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog index ff7cbf103ad..3499eaee5c0 100644 --- a/Build/source/texk/web2c/omegaware/ChangeLog +++ b/Build/source/texk/web2c/omegaware/ChangeLog @@ -1,3 +1,12 @@ +2015-01-18 Peter Breitenlohner + + * odvicopy.ch: Drop intcast(). + * odvitype.ch: Drop intcast(). + * ofm2opl.ch: Drop intcast(). + * opl2ofm.ch: Drop intcast(). + * ovf2ovp.ch: Drop intcast(). + * ovp2ovf.ch: Drop intcast(). + 2015-01-16 Peter Breitenlohner * odvicopy.web: Avoid useless differences with ../dvicopy.web. diff --git a/Build/source/texk/web2c/omegaware/odvicopy.ch b/Build/source/texk/web2c/omegaware/odvicopy.ch index c7d6c432425..06a9934453a 100644 --- a/Build/source/texk/web2c/omegaware/odvicopy.ch +++ b/Build/source/texk/web2c/omegaware/odvicopy.ch @@ -163,32 +163,6 @@ procedure overflow(@!p:pckt_pointer;@!n:int_16u); noreturn procedure overflow(@!p:pckt_pointer;@!n:int_16u); @z -@x [51] Fix casting problem in C. -@d comp_spair(#) == if a<128 then #:=a*256+b @+ else #:=(a-256)*256+b -@d comp_upair(#) == #:=a*256+b -@y -@d comp_spair(#) == if a<128 then #:=a*intcast(256)+b - @+ else #:=(a-intcast(256))*intcast(256)+b -@d comp_upair(#) == #:=a*intcast(256)+b -@z - -@x [52] -if a<128 then #:=(a*256+b)*256+c @+ else #:=((a-256)*256+b)*256+c -@d comp_utrio(#) == #:=(a*256+b)*256+c -@y -if a<128 then #:=(a*intcast(256)+b)*intcast(256)+c @+ -else #:=((a-intcast(256))*intcast(256)+b)*intcast(256)+c -@d comp_utrio(#) == #:=(a*intcast(256)+b)*intcast(256)+c -@z - -@x [53] -if a<128 then #:=((a*256+b)*256+c)*256+d -else #:=(((a-256)*256+b)*256+c)*256+d -@y -if a<128 then #:=((a*intcast(256)+b)*intcast(256)+c)*intcast(256)+d -else #:=(((a-intcast(256))*intcast(256)+b)*intcast(256)+c)*intcast(256)+d -@z - @x [62] cur_name is no longer a fixed-size array. @!cur_name:packed array[1..name_length] of char; {external name, with no lower case letters} @@ -260,7 +234,7 @@ while l_cur_name127 then bad_font -else #:=tfm_b0*256+tfm_b1 -@d tfm_b23(#)== {|tfm_b2..tfm_b3| as non-negative integer} -if tfm_b2>127 then bad_font -else #:=tfm_b2*256+tfm_b3 -@d tfm_squad(#)== {|tfm_b0..tfm_b3| as signed integer} -if tfm_b0<128 then #:=((tfm_b0*256+tfm_b1)*256+tfm_b2)*256+tfm_b3 -else #:=(((tfm_b0-256)*256+tfm_b1)*256+tfm_b2)*256+tfm_b3 -@d tfm_uquad== {|tfm_b0..tfm_b3| as unsigned integer} -(((tfm_b0*256+tfm_b1)*256+tfm_b2)*256+tfm_b3) -@y -@d tfm_b01(#)== {|tfm_b0..tfm_b1| as non-negative integer} -if tfm_b0>127 then bad_font -else #:=tfm_b0*intcast(256)+tfm_b1 -@d tfm_b23(#)== {|tfm_b2..tfm_b3| as non-negative integer} -if tfm_b2>127 then bad_font -else #:=tfm_b2*intcast(256)+tfm_b3 -@d tfm_squad(#)== {|tfm_b0..tfm_b3| as signed integer} -if tfm_b0<128 -then #:=((tfm_b0*intcast(256)+tfm_b1)*intcast(256)+tfm_b2)*intcast(256)+tfm_b3 -else #:=(((tfm_b0-intcast(256))*intcast(256)+tfm_b1) - *intcast(256)+tfm_b2)*intcast(256)+tfm_b3 -@d tfm_uquad== {|tfm_b0..tfm_b3| as unsigned integer} -(((tfm_b0*intcast(256)+tfm_b1)*intcast(256)+tfm_b2)*intcast(256)+tfm_b3) -@z - @x [101] Avoid compiler warnings read_tfm_word; tfm_b01(first_two); @y @@ -394,7 +340,7 @@ procedure bad_dvi; noreturn procedure bad_dvi; @z -@x [110] Fix up opening the binary files +@x [111] Fix up opening the binary files @ To prepare |dvi_file| for input, we |reset| it. @= @@ -407,7 +353,7 @@ dvi_loc:=0; dvi_loc:=0; @z -@x [112] Make dvi_length() and dvi_move() work. +@x [113] Make dvi_length() and dvi_move() work. @p function dvi_length:int_32; begin set_pos(dvi_file,-1); dvi_length:=cur_pos(dvi_file); end; @@ -428,7 +374,7 @@ dvi_loc:=n; end; @z -@x [135] +@x [135] Lower case file name extensions. id3(".")("V")("F")(vf_ext); {file name extension for \.{VF} files} id4(".")("O")("V")("F")(ovf_ext); {file name extension for \.{OVF} files} @y diff --git a/Build/source/texk/web2c/omegaware/odvitype.ch b/Build/source/texk/web2c/omegaware/odvitype.ch index 2d96b026670..653a879aae2 100644 --- a/Build/source/texk/web2c/omegaware/odvitype.ch +++ b/Build/source/texk/web2c/omegaware/odvitype.ch @@ -165,31 +165,6 @@ end; @!cur_name:^char; {external name} @z -@x [27] Make get_n_bytes routines work with 16-bit math. -get_two_bytes:=a*256+b; -@y -get_two_bytes:=a*intcast(256)+b; -@z -@x -get_three_bytes:=(a*256+b)*256+c; -@y -get_three_bytes:=(a*intcast(256)+b)*256+c; -@z -@x -if a<128 then signed_trio:=(a*256+b)*256+c -else signed_trio:=((a-256)*256+b)*256+c; -@y -if a<128 then signed_trio:=(a*intcast(256)+b)*256+c -else signed_trio:=((a-intcast(256))*256+b)*256+c; -@z -@x -if a<128 then signed_quad:=((a*256+b)*256+c)*256+d -else signed_quad:=(((a-256)*256+b)*256+c)*256+d; -@y -if a<128 then signed_quad:=((a*intcast(256)+b)*256+c)*256+d -else signed_quad:=(((a-256)*intcast(256)+b)*256+c)*256+d; -@z - @x [28] dvi_length and move_to_byte. @p function dvi_length:integer; begin set_pos(dvi_file,-1); dvi_length:=cur_pos(dvi_file); @@ -220,80 +195,6 @@ nco:=0; extra_words:=0; read_tfm_word; @z -@x [35] Make 16-bit TFM calculations work. -if (b0*256+b1)<>0 then begin {TFM file} - ofm_level:=-1; - lh:=b2*256+b3; - read_tfm_word; font_bc[nf]:=b0*256+b1; font_ec[nf]:=b2*256+b3; -@y -if (b0*intcast(256)+b1)<>0 then begin {TFM file} - ofm_level:=-1; - lh:=b2*intcast(256)+b3; - read_tfm_word; font_bc[nf]:=b0*intcast(256)+b1; - font_ec[nf]:=b2*intcast(256)+b3; -@z -@x - read_tfm_word; nw:=b0*256+b1; -@y - read_tfm_word; nw:=b0*intcast(256)+b1; -@z -@x - if b0<128 then tfm_check_sum:=((b0*256+b1)*256+b2)*256+b3 - else tfm_check_sum:=(((b0-256)*256+b1)*256+b2)*256+b3 -@y - if b0<128 then tfm_check_sum:=((b0*intcast(256)+b1)*256+b2)*256+b3 - else tfm_check_sum:=(((b0-256)*intcast(256)+b1)*256+b2)*256+b3 -@z -@x - ofm_level:=b2*256+b3; - read_tfm_word; - read_tfm_word; lh:=((b0*256+b1)*256+b2)*256+b3; - read_tfm_word; font_bc[nf]:=((b0*256+b1)*256+b2)*256+b3; - read_tfm_word; font_ec[nf]:=((b0*256+b1)*256+b2)*256+b3; -@y - ofm_level:=b2*intcast(256)+b3; - read_tfm_word; - read_tfm_word; lh:=((b0*intcast(256)+b1)*256+b2)*256+b3; - read_tfm_word; font_bc[nf]:=((b0*intcast(256)+b1)*256+b2)*256+b3; - read_tfm_word; font_ec[nf]:=((b0*intcast(256)+b1)*256+b2)*256+b3; -@z -@x - read_tfm_word; nw:=((b0*256+b1)*256+b2)*256+b3; -@y - read_tfm_word; nw:=((b0*intcast(256)+b1)*256+b2)*256+b3; -@z -@x - read_tfm_word; extra_words:=(((b0*256+b1)*256+b2)*256+b3) div 2; -@y - read_tfm_word; - extra_words:=(((b0*intcast(256)+b1)*256+b2)*256+b3) div 2; -@z -@x - if b0<128 then tfm_check_sum:=((b0*256+b1)*256+b2)*256+b3 - else tfm_check_sum:=(((b0-256)*256+b1)*256+b2)*256+b3 -@y - if b0<128 then tfm_check_sum:=((b0*intcast(256)+b1)*256+b2)*256+b3 - else tfm_check_sum:=(((b0-256)*intcast(256)+b1)*256+b2)*256+b3 -@z -@x - if (b0*256+b1)>nw then goto 9997; - width[k]:=(b0*256+b1); -@y - if (b0*intcast(256)+b1)>nw then goto 9997; - width[k]:=(b0*intcast(256)+b1); -@z -@x - if (b0*256+b1)>nw then goto 9997; - width[k]:=(b0*256+b1); - read_tfm_word; read_tfm_word; - kprime:=k+(b0*256+b1); -@y - if (b0*intcast(256)+b1)>nw then goto 9997; - width[k]:=(b0*intcast(256)+b1); - read_tfm_word; read_tfm_word; - kprime:=k+(b0*intcast(256)+b1); -@z - @x [43] Initialize optional variables sooner. @ @= out_mode:=the_works; max_pages:=1000000; start_vals:=0; start_there[0]:=false; diff --git a/Build/source/texk/web2c/omegaware/ofm2opl.ch b/Build/source/texk/web2c/omegaware/ofm2opl.ch index 181a5b04d64..079e8424d2a 100644 --- a/Build/source/texk/web2c/omegaware/ofm2opl.ch +++ b/Build/source/texk/web2c/omegaware/ofm2opl.ch @@ -226,12 +226,6 @@ else out_hex_char(c); put_byte(RCE_string[1+(b div 3)], pl_file); @z -@x [41] Force 32-bit constant arithmetic for 16-bit machines. -f:=((tfm[k+1] mod 16)*@'400+tfm[k+2])*@'400+tfm[k+3]; -@y -f:=((tfm[k+1] mod 16)*intcast(@'400)+tfm[k+2])*@'400+tfm[k+3]; -@z - % [95] No progress reports unless verbose. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @x diff --git a/Build/source/texk/web2c/omegaware/opl2ofm.ch b/Build/source/texk/web2c/omegaware/opl2ofm.ch index a6b3896648a..04e90711ae2 100644 --- a/Build/source/texk/web2c/omegaware/opl2ofm.ch +++ b/Build/source/texk/web2c/omegaware/opl2ofm.ch @@ -249,15 +249,6 @@ begin if fabs(x/design_units)>=16.0 then end; @z -% [141] char_remainder[c] is unsigned, and label_table[sort_ptr].rr -% might be -1, and if -1 is coerced to being unsigned, it will be bigger -% than anything else. -@x - while label_table[sort_ptr].rr>char_remainder[c] do -@y - while label_table[sort_ptr].rr>intcast(char_remainder[c]) do -@z - @x [170] Eliminate unused variables. var @!krn_ptr:0..max_kerns; {an index into |kern|} @!c:integer; {runs through all character codes} diff --git a/Build/source/texk/web2c/omegaware/otangle.ch b/Build/source/texk/web2c/omegaware/otangle.ch index 0baf8628e73..16eac2844ad 100644 --- a/Build/source/texk/web2c/omegaware/otangle.ch +++ b/Build/source/texk/web2c/omegaware/otangle.ch @@ -354,14 +354,6 @@ identifier: begin k:=0; j:=byte_start[cur_val]; w:=cur_val mod ww; end; @z -@x [??] Fix casting bug -@d add_in(#)==begin accumulator:=accumulator+next_sign*(#); next_sign:=+1; - end -@y -@d add_in(#)==begin accumulator:=accumulator+next_sign*intcast(#); next_sign:=+1; - end -@z - @x [179] make term_in = input any error stop will set |debug_cycle| to zero. @y diff --git a/Build/source/texk/web2c/omegaware/ovf2ovp.ch b/Build/source/texk/web2c/omegaware/ovf2ovp.ch index 84df6150450..51f856f12b5 100644 --- a/Build/source/texk/web2c/omegaware/ovf2ovp.ch +++ b/Build/source/texk/web2c/omegaware/ovf2ovp.ch @@ -345,12 +345,6 @@ end; put_byte(RCE_string[1+(b div 3)], vpl_file); @z -@x [62] Force 32-bit constant arithmetic for 16-bit machines. -f:=((tfm[k+1] mod 16)*@'400+tfm[k+2])*@'400+tfm[k+3]; -@y -f:=((tfm[k+1] mod 16)*intcast(@'400)+tfm[k+2])*@'400+tfm[k+3]; -@z - % [101] No progress reports unless verbose. @x begin if chars_on_line=8 then diff --git a/Build/source/texk/web2c/omegaware/ovp2ovf.ch b/Build/source/texk/web2c/omegaware/ovp2ovf.ch index d2b310cc980..7b332eacae0 100644 --- a/Build/source/texk/web2c/omegaware/ovp2ovf.ch +++ b/Build/source/texk/web2c/omegaware/ovp2ovf.ch @@ -226,16 +226,6 @@ begin if fabs(x/design_units)>=16.0 then end; @z -% [194] char_remainder[c] is unsigned, and label_table[sort_ptr].rr -% might be -1, and if -1 is coerced to being unsigned, it will be bigger -% than anything else. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@x - while label_table[sort_ptr].rr>char_remainder[c] do -@y - while label_table[sort_ptr].rr>intcast(char_remainder[c]) do -@z - @x [200] Change VF-byte output to fix ranges. @d vout(#)==write(vf_file,#) @y -- cgit v1.2.3