From: <fla...@gm...> - 2008-01-16 19:30:22
|
# HG changeset patch # User Diego 'Flameeyes' Pettenò <fla...@gm...> # Date 1200510587 -3600 # Node ID d35b87a8b36162115ed750ccb32052178e4234ad # Parent 245a4a9767b25ca3b8e9c201262cb7176a9103b6 Remove two unused files, don't define (x)mmx_supported on non-x86. diff -r d35b87a8b36162115ed750ccb32052178e4234ad -r 245a4a9767b25ca3b8e9c201262cb7176a9103b6 src/post/goom/Makefile.am --- a/src/post/goom/Makefile.am Wed Jan 16 20:09:47 2008 +0100 +++ b/src/post/goom/Makefile.am Wed Jan 16 20:03:58 2008 +0100 @@ -30,7 +30,7 @@ xineplug_post_goom_la_SOURCES = mmx.c xi xineplug_post_goom_la_SOURCES = mmx.c xine_goom.c \ config_param.c convolve_fx.c cpu_info.c drawmethods.c filters.c flying_stars_fx.c \ gfontlib.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c goomsl_heap.c \ - goomsl_lex.c goomsl_yacc.c graphic.c ifs.c lines.c \ + graphic.c ifs.c lines.c \ plugin_info.c sound_tester.c surf3d.c tentacle3d.c v3d.c xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL) -lm $(noinst_LTLIBRARIES) xineplug_post_goom_la_CFLAGS = $(DEFAULT_OCFLAGS) $(AM_CFLAGS) diff -r d35b87a8b36162115ed750ccb32052178e4234ad -r 245a4a9767b25ca3b8e9c201262cb7176a9103b6 src/post/goom/mmx.c --- a/src/post/goom/mmx.c Wed Jan 16 20:09:47 2008 +0100 +++ b/src/post/goom/mmx.c Wed Jan 16 20:03:58 2008 +0100 @@ -16,9 +16,11 @@ // faire : a / sqrtperte <=> a >> PERTEDEC #define PERTEDEC 4 +#ifdef CPU_X86 int mmx_supported (void) { return (mm_support()&0x1); } +#endif void zoom_filter_mmx (int prevX, int prevY, Pixel *expix1, Pixel *expix2, diff -r d35b87a8b36162115ed750ccb32052178e4234ad -r 245a4a9767b25ca3b8e9c201262cb7176a9103b6 src/post/goom/mmx.h --- a/src/post/goom/mmx.h Wed Jan 16 20:09:47 2008 +0100 +++ b/src/post/goom/mmx.h Wed Jan 16 20:03:58 2008 +0100 @@ -244,8 +244,10 @@ mmx_ok(void) return ( mm_support() & 0x1 ); } +#ifdef CPU_X86 int mmx_supported (void); int xmmx_supported (void); +#endif /* MMX optimized implementations */ diff -r d35b87a8b36162115ed750ccb32052178e4234ad -r 245a4a9767b25ca3b8e9c201262cb7176a9103b6 src/post/goom/xmmx.c --- a/src/post/goom/xmmx.c Wed Jan 16 20:09:47 2008 +0100 +++ b/src/post/goom/xmmx.c Wed Jan 16 20:03:58 2008 +0100 @@ -23,6 +23,7 @@ /*#include "xmmx.h"*/ #include "goom_graphic.h" +#ifdef CPU_X86 int xmmx_supported (void) { #ifdef ARCH_X86_64 return 0; /* Haven't yet converted zoom_filter_xmmx @@ -31,6 +32,7 @@ int xmmx_supported (void) { return (mm_support()&0x8)>>3; #endif } +#endif void zoom_filter_xmmx (int prevX, int prevY, Pixel *expix1, Pixel *expix2, diff -r d35b87a8b36162115ed750ccb32052178e4234ad -r 245a4a9767b25ca3b8e9c201262cb7176a9103b6 src/post/goom/goomsl_lex.c --- a/src/post/goom/goomsl_lex.c Wed Jan 16 20:09:47 2008 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2108 +0,0 @@ -#line 2 "goomsl_lex.c" - -#line 4 "goomsl_lex.c" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 31 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include <stdlib.h> - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ - -#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L -#include <inttypes.h> -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -#if __STDC__ - -#define YY_USE_CONST - -#endif /* __STDC__ */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN (yy_start) = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START (((yy_start) - 1) / 2) -#define YYSTATE YY_START - [... 1856 lines omitted ...] -char *yyget_text (void) -{ - return yytext; -} - -/** Set the current line number. - * @param line_number - * - */ -void yyset_lineno (int line_number ) -{ - - yylineno = line_number; -} - -/** Set the input stream. This does not discard the current - * input buffer. - * @param in_str A readable stream. - * - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * in_str ) -{ - yyin = in_str ; -} - -void yyset_out (FILE * out_str ) -{ - yyout = out_str ; -} - -int yyget_debug (void) -{ - return yy_flex_debug; -} - -void yyset_debug (int bdebug ) -{ - yy_flex_debug = bdebug ; -} - -/* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) -{ - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(); - } - - /* Destroy the stack itself. */ - yyfree((yy_buffer_stack) ); - (yy_buffer_stack) = NULL; - - yyfree ( (yy_state_buf) ); - - return 0; -} - -/* - * Internal utility routines. - */ - -#ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) -{ - register int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; -} -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) -{ - register int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; -} -#endif - -void *yyalloc (yy_size_t size ) -{ - return (void *) malloc( size ); -} - -void *yyrealloc (void * ptr, yy_size_t size ) -{ - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); -} - -void yyfree (void * ptr ) -{ - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} - -#define YYTABLES_NAME "yytables" - -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif -#line 90 "goomsl_lex.l" - - - - -int yywrap(void) { return 1; yyunput(0,0); } - - diff -r d35b87a8b36162115ed750ccb32052178e4234ad -r 245a4a9767b25ca3b8e9c201262cb7176a9103b6 src/post/goom/goomsl_yacc.c --- a/src/post/goom/goomsl_yacc.c Wed Jan 16 20:09:47 2008 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2997 +0,0 @@ -/* A Bison parser, made by GNU Bison 1.875. */ - -/* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* Written by Richard Stallman by simplifying the original so called - ``semantic'' parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 0 - -/* Using locations. */ -#define YYLSP_NEEDED 0 - - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - LTYPE_INTEGER = 258, - LTYPE_FLOAT = 259, - LTYPE_VAR = 260, - LTYPE_PTR = 261, - PTR_TK = 262, - INT_TK = 263, - FLOAT_TK = 264, - DECLARE = 265, - EXTERNAL = 266, - WHILE = 267, - DO = 268, - NOT = 269, - PLUS_EQ = 270, - SUB_EQ = 271, - DIV_EQ = 272, - MUL_EQ = 273, - SUP_EQ = 274, - LOW_EQ = 275, - NOT_EQ = 276, - STRUCT = 277, - FOR = 278, - IN = 279 - }; -#endif -#define LTYPE_INTEGER 258 -#define LTYPE_FLOAT 259 -#define LTYPE_VAR 260 -#define LTYPE_PTR 261 -#define PTR_TK 262 -#define INT_TK 263 -#define FLOAT_TK 264 -#define DECLARE 265 -#define EXTERNAL 266 -#define WHILE 267 -#define DO 268 -#define NOT 269 -#define PLUS_EQ 270 -#define SUB_EQ 271 -#define DIV_EQ 272 -#define MUL_EQ 273 -#define SUP_EQ 274 -#define LOW_EQ 275 -#define NOT_EQ 276 -#define STRUCT 277 -#define FOR 278 -#define IN 279 - - - - -/* Copy the first part of user declarations. */ -#line 6 "goomsl_yacc.y" - - #include <stdio.h> - #include <stdlib.h> - #include <string.h> - #include "goomsl.h" - #include "goomsl_private.h" - -#define STRUCT_ALIGNMENT 16 -/* #define VERBOSE */ - - int yylex(void); - void yyerror(char *); - extern GoomSL *currentGoomSL; - - static NodeType *nodeNew(const char *str, int type, int line_number); - static NodeType *nodeClone(NodeType *node); - static void nodeFreeInternals(NodeType *node); [... 2745 lines omitted ...] - } - else -#endif /* YYERROR_VERBOSE */ - yyerror ("syntax error"); - } - - - - if (yyerrstatus == 3) - { - /* If just tried and failed to reuse lookahead token after an - error, discard it. */ - - /* Return failure if at end of input. */ - if (yychar == YYEOF) - { - /* Pop the error token. */ - YYPOPSTACK; - /* Pop the rest of the stack. */ - while (yyss < yyssp) - { - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp); - YYPOPSTACK; - } - YYABORT; - } - - YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); - yydestruct (yytoken, &yylval); - yychar = YYEMPTY; - - } - - /* Else will try to reuse lookahead token after shifting the error - token. */ - goto yyerrlab1; - - -/*----------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action. | -`----------------------------------------------------*/ -yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - for (;;) - { - yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } - - /* Pop the current state because it cannot handle the error token. */ - if (yyssp == yyss) - YYABORT; - - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[yystate], yyvsp); - yyvsp--; - yystate = *--yyssp; - - YY_STACK_PRINT (yyss, yyssp); - } - - if (yyn == YYFINAL) - YYACCEPT; - - YYDPRINTF ((stderr, "Shifting error token, ")); - - *++yyvsp = yylval; - - - yystate = yyn; - goto yynewstate; - - -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - yyresult = 0; - goto yyreturn; - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - yyresult = 1; - goto yyreturn; - -#ifndef yyoverflow -/*----------------------------------------------. -| yyoverflowlab -- parser overflow comes here. | -`----------------------------------------------*/ -yyoverflowlab: - yyerror ("parser stack overflow"); - yyresult = 2; - /* Fall through. */ -#endif - -yyreturn: -#ifndef yyoverflow - if (yyss != yyssa) - YYSTACK_FREE (yyss); -#endif - return yyresult; -} - - -#line 1396 "goomsl_yacc.y" - - - -void yyerror(char *str) -{ /* {{{ */ - fprintf(stderr, "ERROR: Line %d, %s\n", currentGoomSL->num_lines, str); - currentGoomSL->compilationOK = 0; - exit(1); -} /* }}} */ - - |