Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/corelib/arch/qatomic_s390.h

    r651 r769  
    367367{
    368368#ifndef __s390x__
    369     return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr",
    370                              "", "bcr 15,0\n");
    371 #else
    372     return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr",
    373                               "", "bcr 15,0\n");
     369    return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "", "");
     370#else
     371    return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "", "");
    374372#endif
    375373}
     
    379377{
    380378#ifndef __s390x__
    381     return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr", "", "");
    382 #else
    383     return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr", "", "");
     379    return (T*)__CS_OLD_LOOP(");
     380#else
     381    return (T*)__CSG_OLD_LOOP(");
    384382#endif
    385383}
     
    389387{
    390388#ifndef __s390x__
    391     return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr",
    392                              "bcr 15,0 \n", "");
    393 #else
    394     return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr",
    395                               "bcr 15,0\n", "");
     389    return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "bcr 15,0 \n", "");
     390#else
     391    return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "bcr 15,0\n", "");
    396392#endif
    397393}
Note: See TracChangeset for help on using the changeset viewer.