comparison src/share/vm/adlc/main.cpp @ 628:7bb995fbd3c0

Merge
author trims
date Thu, 12 Mar 2009 18:16:36 -0700
parents dbbe28fc66b5
children c18cbe5936b8
comparison
equal deleted inserted replaced
580:ce2272390558 628:7bb995fbd3c0
1 /* 1 /*
2 * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. 2 * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
347 if (_ADL_file._name) printf("%s: ", _ADL_file._name); 347 if (_ADL_file._name) printf("%s: ", _ADL_file._name);
348 printf("No output produced"); 348 printf("No output produced");
349 } 349 }
350 else { 350 else {
351 if (_ADL_file._name) printf("%s --> ", _ADL_file._name); 351 if (_ADL_file._name) printf("%s --> ", _ADL_file._name);
352 printf("%s, %s, %s, %s, %s, %s, %s, %s, %s", 352 printf("%s, %s, %s, %s, %s, %s, %s, %s, %s, %s",
353 _CPP_file._name, 353 _CPP_file._name,
354 _CPP_CLONE_file._name, 354 _CPP_CLONE_file._name,
355 _CPP_EXPAND_file._name, 355 _CPP_EXPAND_file._name,
356 _CPP_FORMAT_file._name, 356 _CPP_FORMAT_file._name,
357 _CPP_GEN_file._name, 357 _CPP_GEN_file._name,
358 _CPP_MISC_file._name, 358 _CPP_MISC_file._name,
359 _CPP_PEEPHOLE_file._name, 359 _CPP_PEEPHOLE_file._name,
360 _CPP_PIPELINE_file._name, 360 _CPP_PIPELINE_file._name,
361 _HPP_file._name, _DFA_file._name); 361 _HPP_file._name,
362 _DFA_file._name);
362 } 363 }
363 printf("\n"); 364 printf("\n");
364 } 365 }
365 } 366 }
366 367
429 assert(strncmp(legal_end, "// Copyright", 12) == 0, "Incorrect header of AD file"); 430 assert(strncmp(legal_end, "// Copyright", 12) == 0, "Incorrect header of AD file");
430 while(legal_end[0] == '/' && legal_end[1] == '/') { 431 while(legal_end[0] == '/' && legal_end[1] == '/') {
431 legal_end = fbuf.get_line(); 432 legal_end = fbuf.get_line();
432 } 433 }
433 *legal_text = legal_start; 434 *legal_text = legal_start;
434 return (legal_end - legal_start); 435 return (int) (legal_end - legal_start);
435 } 436 }
436 437
437 // VS2005 has its own definition, identical to this one. 438 // VS2005 has its own definition, identical to this one.
438 #if !defined(_WIN32) || defined(_WIN64) || _MSC_VER < 1400 439 #if !defined(_WIN32) || defined(_WIN64) || _MSC_VER < 1400
439 void *operator new( size_t size, int, const char *, int ) { 440 void *operator new( size_t size, int, const char *, int ) {