comparison src/bytecode.c @ 46370:40db0673e6f0

Most uses of XSTRING combined with STRING_BYTES or indirection changed to SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references left unchanged for now.
author Ken Raeburn <raeburn@raeburn.org>
date Mon, 15 Jul 2002 00:00:41 +0000
parents 1fb8f75062c6
children 99d1224dfe6c
comparison
equal deleted inserted replaced
46369:dd1d3b1d0053 46370:40db0673e6f0
325 XUNMARK (*obj); 325 XUNMARK (*obj);
326 326
327 XUNMARK (stack->byte_string); 327 XUNMARK (stack->byte_string);
328 XUNMARK (stack->constants); 328 XUNMARK (stack->constants);
329 329
330 if (stack->byte_string_start != XSTRING (stack->byte_string)->data) 330 if (stack->byte_string_start != SDATA (stack->byte_string))
331 { 331 {
332 int offset = stack->pc - stack->byte_string_start; 332 int offset = stack->pc - stack->byte_string_start;
333 stack->byte_string_start = XSTRING (stack->byte_string)->data; 333 stack->byte_string_start = SDATA (stack->byte_string);
334 stack->pc = stack->byte_string_start + offset; 334 stack->pc = stack->byte_string_start + offset;
335 } 335 }
336 } 336 }
337 } 337 }
338 338
458 such a byte-code string is loaded as multibyte while raw 8-bit 458 such a byte-code string is loaded as multibyte while raw 8-bit
459 characters converted to multibyte form. Thus, now we must 459 characters converted to multibyte form. Thus, now we must
460 convert them back to the originally intended unibyte form. */ 460 convert them back to the originally intended unibyte form. */
461 bytestr = Fstring_as_unibyte (bytestr); 461 bytestr = Fstring_as_unibyte (bytestr);
462 462
463 bytestr_length = STRING_BYTES (XSTRING (bytestr)); 463 bytestr_length = SBYTES (bytestr);
464 vectorp = XVECTOR (vector)->contents; 464 vectorp = XVECTOR (vector)->contents;
465 465
466 stack.byte_string = bytestr; 466 stack.byte_string = bytestr;
467 stack.pc = stack.byte_string_start = XSTRING (bytestr)->data; 467 stack.pc = stack.byte_string_start = SDATA (bytestr);
468 stack.constants = vector; 468 stack.constants = vector;
469 stack.bottom = (Lisp_Object *) alloca (XFASTINT (maxdepth) 469 stack.bottom = (Lisp_Object *) alloca (XFASTINT (maxdepth)
470 * sizeof (Lisp_Object)); 470 * sizeof (Lisp_Object));
471 top = stack.bottom - 1; 471 top = stack.bottom - 1;
472 stack.top = NULL; 472 stack.top = NULL;
894 } 894 }
895 895
896 case Btemp_output_buffer_setup: 896 case Btemp_output_buffer_setup:
897 BEFORE_POTENTIAL_GC (); 897 BEFORE_POTENTIAL_GC ();
898 CHECK_STRING (TOP); 898 CHECK_STRING (TOP);
899 temp_output_buffer_setup (XSTRING (TOP)->data); 899 temp_output_buffer_setup (SDATA (TOP));
900 AFTER_POTENTIAL_GC (); 900 AFTER_POTENTIAL_GC ();
901 TOP = Vstandard_output; 901 TOP = Vstandard_output;
902 break; 902 break;
903 903
904 case Btemp_output_buffer_show: 904 case Btemp_output_buffer_show: